diff options
-rwxr-xr-x | database/mariadb/CONFIGURE | 6 | ||||
-rwxr-xr-x | database/mariadb/DETAILS | 16 | ||||
-rw-r--r-- | database/mariadb/HISTORY | 5 |
3 files changed, 21 insertions, 6 deletions
diff --git a/database/mariadb/CONFIGURE b/database/mariadb/CONFIGURE index 1c4a39a367..8945b10949 100755 --- a/database/mariadb/CONFIGURE +++ b/database/mariadb/CONFIGURE @@ -115,4 +115,10 @@ if list_find "$MARIADB_ENGINES" "all"; then MARIADB_ENGINES="all" elif list_find "$MARIADB_ENGINES" "none"; then MARIADB_ENGINES="none" +fi && + +if list_find "$MARIADB_ENGINES" "aria" && [[ $MARIADB_BRANCH == 5.5 ]]; then + config_query_option MARIADB_OPTS "Use Aria engine (instead of MyISAM) for temporary tables?" y \ + "-DUSE_ARIA_FOR_TMP_TABLES=ON" \ + "-DUSE_ARIA_FOR_TMP_TABLES=OFF" fi diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS index 51b0f2ad93..c06bf40667 100755 --- a/database/mariadb/DETAILS +++ b/database/mariadb/DETAILS @@ -3,8 +3,8 @@ if [[ $MARIADB_BRANCH == 5.3 ]]; then VERSION=5.3.12 SOURCE_HASH=sha512:d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 elif [[ $MARIADB_BRANCH == 5.5 ]]; then - VERSION=5.5.36 - SOURCE_HASH=sha512:b7de14f4d4a08f51aae339779c59798f3ed110aa3d65038c39514161ee73b6cc95f95fe1b15434daf33de689b0d7351cbf7a1c90ca980f0f020b085ef23aa016 + VERSION=5.5.37 + SOURCE_HASH=sha512:aa7bdde63983ef81dd42996fdea776d47752033208ea96d2ded452a9523ae5ae2fa9b69f1d09ef49bba769dcc3ad88dc55f38fdf34d34b1a0870a794fa26a1f1 else VERSION=5.2.14 SECURITY_PATCH=3 @@ -13,19 +13,23 @@ else fi SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" +if [[ $MARIADB_BRANCH == 5.5 ]]; then + SOURCE_URL[0]=http://mirror.netcologne.de/$SPELL/$SPELL-$VERSION/source/$SOURCE +else SOURCE_URL[0]=http://mirrors.fe.up.pt/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE SOURCE_URL[1]=http://ftp-stud.hs-esslingen.de/pub/Mirrors/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE SOURCE_URL[2]=http://ftp.osuosl.org/pub/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE SOURCE_URL[3]=http://mirrors.supportex.net/$SPELL/$SPELL-$VERSION/kvm-tarbake-jaunty-x86/$SOURCE +fi LICENSE[0]=GPL WEB_SITE=https://mariadb.org/ KEYWORDS="sql database" ENTERED=20100402 SHORT="backward compatible, drop-in replacement branch of the MySQL(r) database server" cat << EOF -MariaDB is a backward compatible, drop-in replacement branch of the -MySQL(r) database server. +MariaDB is a backward compatible, drop-in replacement branch of the MySQL(r) +database server. -It includes all major open source storage engines, -including the Maria storage engine. +It includes all major open source storage engines, including the Maria storage +engine. EOF diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY index 07e78cea40..2028321b16 100644 --- a/database/mariadb/HISTORY +++ b/database/mariadb/HISTORY @@ -1,3 +1,8 @@ +2014-05-13 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 5.5.36 (5.5 branch); added mirror for 5.5 + branch; cleaned up + * CONFIGURE: added config option for tmp tables + 2014-04-08 Vlad Glagolev <stealth@sourcemage.org> * UP_TRIGGERS: update triggers for switching between branches |