Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3f109537d4be7f5d6f27e612d6559a1623e565b1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3f109537d4be7f5d6f27e612d6559a1623e565b1)
  • Date: Mon, 7 Apr 2014 12:14:04 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

database/mariadb/BUILD | 72 ++++++++--
database/mariadb/CONFIGURE | 185
++++++++++++++++------------
database/mariadb/DEPENDS | 96 ++++++++++----
database/mariadb/DETAILS | 3
database/mariadb/FINAL | 3
database/mariadb/HISTORY | 14 ++
database/mariadb/INSTALL | 18 +-
database/mariadb/PREPARE | 4
database/mariadb/PRE_BUILD | 16 +-
database/mariadb/PRE_SUB_DEPENDS | 20 ++-
database/mariadb/REPAIR^all^PRE_SUB_DEPENDS | 20 +++
database/mariadb/SUB_DEPENDS | 45 ++++--
12 files changed, 339 insertions(+), 157 deletions(-)

New commits:
commit 3f109537d4be7f5d6f27e612d6559a1623e565b1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mariadb: added branch 5.5

diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
index 47781f2..d9075b7 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -1,27 +1,61 @@
create_account mariadb &&

-OPTS="$MADB_OPTS $OPTS" &&
+OPTS="$MARIADB_OPTS $OPTS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&

-local LD_PRELOAD_OLD="$LD_PRELOAD" &&
-unset LD_PRELOAD &&
-CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ if [[ $MARIA_TESTS == n ]]; then
+ OPTS="-DWITH_UNIT_TESTS=OFF -DINSTALL_MYSQLTESTDIR=OFF $OPTS"
+ else
+ OPTS="-DWITH_UNIT_TESTS=ON -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
$OPTS"
+ fi &&

-if glibc_is_nptl; then
- OPTS="--with-named-thread-libs=-lpthread $OPTS" &&
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-fi &&
+ if [[ $MARIA_BENCH == n ]]; then
+ OPTS="-DINSTALL_SQLBENCHDIR=OFF $OPTS"
+ else
+ OPTS="-DINSTALL_SQLBENCHDIR=share/mysql/sql-bench $OPTS"
+ fi &&

-OPTS="--with-mysqld-user=mariadb \
- --with-charset=$MADB_CHARSET \
- --with-plugins=${MADB_ENGINES// /,} \
- --localstatedir=${INSTALL_ROOT}/var/lib/mariadb \
- --enable-assembler \
- --enable-thread-safe-client \
- --with-readline \
- $OPTS" &&
+ OPTS="-DDEFAULT_CHARSET=$MARIADB_CHARSET \
+ -DMYSQL_DATADIR=${INSTALL_ROOT}/var/lib/mariadb \
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_DOCDIR=share/doc/mariadb \
+ -DINSTALL_DOCREADMEDIR=share/doc/mariadb \
+ $OPTS" &&

-default_build &&
+ if [[ $MARIADB_ENGINES == none ]] || [[ $MARIADB_ENGINES == all ]]; then
+ OPTS="-DWITH_${MARIADB_ENGINES^^} $OPTS"
+ else
+ for engine in $MARIADB_ENGINES; do
+ OPTS="-DWITH_${engine^^}_STORAGE_ENGINE=ON $OPTS"
+ done
+ fi &&

-LD_PRELOAD="$LD_PRELOAD_OLD" &&
-make
+ cmake_build
+else
+ local LD_PRELOAD_OLD="$LD_PRELOAD" &&
+ unset LD_PRELOAD &&
+ CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&
+
+ if glibc_is_nptl; then
+ OPTS="--with-named-thread-libs=-lpthread $OPTS" &&
+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+ fi &&
+
+ OPTS="--with-mysqld-user=mariadb \
+ --with-charset=$MARIADB_CHARSET \
+ --with-plugins=${MARIADB_ENGINES// /,} \
+ --localstatedir=${INSTALL_ROOT}/var/lib/mariadb \
+ --enable-assembler \
+ --enable-thread-safe-client \
+ --with-readline \
+ $OPTS" &&
+
+ default_build &&
+
+ LD_PRELOAD="$LD_PRELOAD_OLD" &&
+ make
+fi
diff --git a/database/mariadb/CONFIGURE b/database/mariadb/CONFIGURE
index 496c711..1c4a39a 100755
--- a/database/mariadb/CONFIGURE
+++ b/database/mariadb/CONFIGURE
@@ -1,85 +1,118 @@
source $GRIMOIRE/config_query_multi.function &&

-config_query_option MADB_OPTS "Install client only?" n \
- "--without-server" \
- "--with-server" &&
+# backporting legacy options
+if [[ -n "$MADB_OPTS" ]]; then
+ persistent_add MARIADB_OPTS &&
+ MARIADB_OPTS="$MADB_OPTS" &&
+ persistent_remove MADB_OPTS
+fi &&
+
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ if list_find "$MARIADB_OPTS" "--with-embedded-server"; then
+ list_remove "MARIADB_OPTS" "--with-embedded-server" &&
+ list_add "MARIADB_OPTS" "-DWITH_EMBEDDED_SERVER=ON"
+ elif list_find "$MARIADB_OPTS" "--without-embedded-server"; then
+ list_remove "MARIADB_OPTS" "--without-embedded-server" &&
+ list_add "MARIADB_OPTS" "-DWITH_EMBEDDED_SERVER=OFF"
+ elif list_find "$MARIADB_OPTS" "--with-server"; then
+ list_remove "MARIADB_OPTS" "--with-server" &&
+ list_add "MARIADB_OPTS" "-DWITHOUT_SERVER=OFF"
+ elif list_find "$MARIADB_OPTS" "--without-server"; then
+ list_remove "MARIADB_OPTS" "--without-server" &&
+ list_add "MARIADB_OPTS" "-DWITHOUT_SERVER=ON"
+ fi &&
+
+ config_query_option MARIADB_OPTS "Build the embedded server (libmysqld)?"
n \
+ "-DWITH_EMBEDDED_SERVER=ON" \
+ "-DWITH_EMBEDDED_SERVER=OFF" &&
+
+ config_query_option MARIADB_OPTS "Install client only?" n \
+ "-DWITHOUT_SERVER=ON" \
+ "-DWITHOUT_SERVER=OFF"
+else
+ config_query_option MARIADB_OPTS "Install client only?" n \
+ "--without-server" \
+ "--with-server" &&
+
+ config_query_option MARIADB_OPTS "Build the embedded server (libmysqld)?"
n \
+ "--with-embedded-server" \
+ "--without-embedded-server" &&

-config_query_option MADB_OPTS "Build the embedded server (libmysqld)?" n \
- "--with-embedded-server" \
- "--without-embedded-server" &&
+ if list_find "$MARIADB_OPTS" "--with-server"; then
+ config_query_option MARIADB_OPTS "Use libevent and have connection
pooling?" n \
+ "--with-libevent=yes" \
+ "--with-libevent=no"
+ fi
+fi &&

-if list_find "$MADB_OPTS" "--with-server"; then
- config_query_option MADB_OPTS "Use libevent and have connection pooling?"
n \
- "--with-libevent=yes" \
- "--with-libevent=no"
+# backporting legacy options
+if [[ -n "$MADB_CHARSET" ]]; then
+ persistent_add MARIADB_CHARSET &&
+ MARIADB_CHARSET="$MADB_CHARSET" &&
+ persistent_remove MADB_CHARSET
fi &&

-config_query_list MADB_CHARSET "Select default character set" \
- latin1 \
- utf8 \
- binary \
- armscii8 \
- ascii \
- big5 \
- cp1250 \
- cp1251 \
- cp1256 \
- cp1257 \
- cp850 \
- cp852 \
- cp866 \
- cp932 \
- dec8 \
- eucjpms \
- euckr \
- gb2312 \
- gbk \
- geostd8 \
- greek \
- hebrew \
- hp8 \
- keybcs2 \
- koi8r \
- koi8u \
- latin2 \
- latin5 \
- latin7 \
- macce \
- macroman \
- sjis \
- swe7 \
- tis620 \
- ucs2 \
- ujis &&
+config_query_list MARIADB_CHARSET "Select default character set:" \
+ latin1 \
+ utf8 \
+ binary \
+ armscii8 \
+ ascii \
+ big5 \
+ cp1250 \
+ cp1251 \
+ cp1256 \
+ cp1257 \
+ cp850 \
+ cp852 \
+ cp866 \
+ cp932 \
+ dec8 \
+ eucjpms \
+ euckr \
+ gb2312 \
+ gbk \
+ geostd8 \
+ greek \
+ hebrew \
+ hp8 \
+ keybcs2 \
+ koi8r \
+ koi8u \
+ latin2 \
+ latin5 \
+ latin7 \
+ macce \
+ macroman \
+ sjis \
+ swe7 \
+ tis620 \
+ ucs2 \
+ ujis \
+ utf16 \
+ utf32 \
+ utf8mb4 &&
+
+# backporting legacy options
+if [[ -n "$MADB_ENGINES" ]]; then
+ persistent_add MARIADB_ENGINES &&
+ MARIADB_ENGINES="$MADB_ENGINES" &&
+ persistent_remove MADB_ENGINES
+fi &&
+
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ local MARIADB_ENGINES_LIST="archive aria blackhole csv example federated
federatedx heap innobase myisam myisammrg ndbcluster oqgraph partition
perfschema sphinx tokudb xtradb"
+else
+ local MARIADB_ENGINES_LIST="archive aria blackhole csv example federated
federatedx heap ibmdb2i innodb_plugin myisam ndbcluster oqgraph pbxt sphinx
xtradb"
+fi &&

-config_query_multi MADB_ENGINES \
- "What additional storage engines to build?" \
- none \
- all \
- archive \
- xtradb \
- blackhole \
- example \
- federated \
- innodb_plugin \
- ndbcluster \
- myisam \
- partition \
- auth \
- daemon_example \
- ftexample \
- csv \
- federatedx \
- heap \
- ibmdb2i \
- aria \
- myisammrg \
- oqgraph \
- pbxt \
- sphinx &&
+config_query_multi MARIADB_ENGINES "What storage engines to build?" \
+ none \
+ all \
+ $MARIADB_ENGINES_LIST &&

-if list_find "$MADB_ENGINES" "all"; then
- MADB_ENGINES="all"
-elif list_find "$MADB_ENGINES" "none"; then
- MADB_ENGINES="none"
+if list_find "$MARIADB_ENGINES" "all"; then
+ MARIADB_ENGINES="all"
+elif list_find "$MARIADB_ENGINES" "none"; then
+ MARIADB_ENGINES="none"
fi
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index ed9f6ec..8f8e628 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -1,34 +1,72 @@
depends perl &&
depends procps &&
depends -sub CXX gcc &&
+depends bison &&

-optional_depends zlib \
- "--with-zlib-dir=$INSTALL_ROOT/" \
- "--with-zlib-dir=bundled" \
- "to use system zlib instead of bundled" &&
-
-# temporarily broken cause of mismatching API
-#optional_depends readline \
-# "--without-readline" "" \
-# "to use system readline instead of bundled" &&
-
-optional_depends libedit \
- "--without-libedit" "" \
- "to use system libedit instead of bundled" &&
-
-optional_depends openssl \
- "--with-ssl" \
- "--without-ssl" \
- "for OpenSSL support" &&
-
-optional_depends valgrind \
- "--with-valgrind" \
- "--without-valgrind" \
- "for Valgrind instrumentation" &&
-
-if list_find "$MADB_OPTS" "--with-libevent=yes"; then
- optional_depends libevent \
- "--with-libevent=$INSTALL_ROOT/usr" \
- "--with-libevent=bundled" \
- "to use system libevent instead of bundled"
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ depends cmake &&
+
+ optional_depends readline \
+ "-DWITH_READLINE=OFF" \
+ "-DWITH_READLINE=ON" \
+ "to use system readline instead of bundled" &&
+
+ optional_depends zlib \
+ "-DWITH_ZLIB=system" \
+ "-DWITH_ZLIB=bundled" \
+ "to use system zlib instead of bundled" &&
+
+ optional_depends openssl \
+ "-DWITH_SSL=system" \
+ "-DWITH_SSL=bundled" \
+ "to use system SSL instead of bundled" &&
+
+ optional_depends tcp_wrappers \
+ "-DWITH_LIBWRAP=ON" \
+ "-DWITH_LIBWRAP=OFF" \
+ "for tcp wrappers support" &&
+
+ optional_depends valgrind \
+ "-DWITH_VALGRIND=ON" \
+ "-DWITH_VALGRIND=OFF" \
+ "for Valgrind instrumentation" &&
+
+ if list_find "$MARIADB_OPTS" "-DWITHOUT_SERVER=OFF"; then
+ optional_depends libevent "" "" "to use libevent and have connection
pooling"
+ fi &&
+
+ if list_find "$MARIADB_ENGINES" "xtradb"; then
+ depends libaio
+ fi &&
+
+ if list_find "$MARIADB_ENGINES" "oqgraph"; then
+ depends boost
+ fi
+else
+ optional_depends zlib \
+ "--with-zlib-dir=$INSTALL_ROOT/" \
+ "--with-zlib-dir=bundled" \
+ "to use system zlib instead of bundled" &&
+
+ optional_depends libedit \
+ "--without-libedit" \
+ "" \
+ "to use system libedit instead of bundled" &&
+
+ optional_depends openssl \
+ "--with-ssl" \
+ "--without-ssl" \
+ "for OpenSSL support" &&
+
+ optional_depends valgrind \
+ "--with-valgrind" \
+ "--without-valgrind" \
+ "for Valgrind instrumentation" &&
+
+ if list_find "$MARIADB_OPTS" "--with-libevent=yes"; then
+ optional_depends libevent \
+ "--with-libevent=$INSTALL_ROOT/usr" \
+ "--with-libevent=bundled" \
+ "to use system libevent instead of bundled"
+ fi
fi
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index 7111b30..51b0f2a 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -2,6 +2,9 @@
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
else
VERSION=5.2.14
SECURITY_PATCH=3
diff --git a/database/mariadb/FINAL b/database/mariadb/FINAL
index daee887..9a9db7d 100755
--- a/database/mariadb/FINAL
+++ b/database/mariadb/FINAL
@@ -1,4 +1,5 @@
-if list_find "$MADB_OPTS" "--with-server" ]]; then
+if list_find "$MARIADB_OPTS" "--with-server" || \
+ list_find "$MARIADB_OPTS" "-DWITHOUT_SERVER=OFF"; then
message "${MESSAGE_COLOR}After initial install of MariaDB run"
message "\"mysql_install_db --user=mariadb\" to create directory"
message "structure and initial tables. See MariaDB documentation"
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 70c5fbd..4bea901 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,17 @@
+2014-04-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, PREPARE: added 5.5 branch
+ * CONFIGURE: renamed lists MADB_* -> MARIADB_*; added missing
charsets;
+ split engines list for different branches
+ * DEPENDS: added bison dependency; added cmake (optional) and libaio,
+ boost for 5.5 branch
+ * BUILD: cmake build for 5.5 branch; use MARIADB_OPTS
+ * INSTALL: added target for 5.5 branch
+ * PRE_BUILD: added check for 5.5 branch; renamed mysqld user mysql ->
+ mariadb
+ * FINAL: fixed syntax error; added check for 5.5 branch
+ * {PRE_,}SUB_DEPENDS: rewritten; echo -> message
+ * REPAIR^all^PRE_SUB_DEPENDS: added
+
2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added 5.3 branch; PATCHLEVEL=1 for 5.2 branch to set
MARIADB_BRANCH in tablet for further usage; updated website
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 9c90b69..1db0634 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -1,13 +1,17 @@
-make benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
- testroot="${TRACK_ROOT}/usr/share/mysql" \
- install &&
+if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ default_install
+else
+ make benchdir_root="${TRACK_ROOT}/usr/share/mysql" \
+ testroot="${TRACK_ROOT}/usr/share/mysql" \
+ install &&

-if [[ $MARIA_TESTS == n ]]; then
+ if [[ $MARIA_TESTS == n ]]; then
rm -rf "${INSTALL_ROOT}/usr/share/mysql/mysql-test"
-fi &&
+ fi &&

-if [[ $MARIA_BENCH == n ]]; then
- rm -fr "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
+ if [[ $MARIA_BENCH == n ]]; then
+ rm -rf "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
+ fi
fi &&

if [[ $INIT_INSTALLED ]]; then
diff --git a/database/mariadb/PREPARE b/database/mariadb/PREPARE
index cb0d439..708765d 100755
--- a/database/mariadb/PREPARE
+++ b/database/mariadb/PREPARE
@@ -7,12 +7,12 @@
#
persistent_read $SPELL MARIADB_BRANCH MARIADB_BRANCH || true &&

-if [[ -z "$MARIADB_BRANCH" ]]; then
+if spell_ok $SPELL && [[ -z "$MARIADB_BRANCH" ]]; then
persistent_add MARIADB_BRANCH &&
local MARIADB_BRANCH="5.2"
fi &&

-prepare_select_branch 5.3 5.2 &&
+prepare_select_branch 5.5 5.3 5.2 &&

config_query MARIA_TESTS "Install MariaDB testing utilities?" n &&
config_query MARIA_BENCH "Install MariaDB benchmarking utilities?" n
diff --git a/database/mariadb/PRE_BUILD b/database/mariadb/PRE_BUILD
index 68b9b02..c01bcd3 100755
--- a/database/mariadb/PRE_BUILD
+++ b/database/mariadb/PRE_BUILD
@@ -1,9 +1,15 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
-sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&

-# our zlib location isn't default
-if is_depends_enabled $SPELL zlib; then
- patch -p0 < "$SPELL_DIRECTORY/zlib-conf.patch"
+if [[ $MARIADB_BRANCH != 5.5 ]]; then
+ sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
+ sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&
+
+ # our zlib location isn't default
+ if is_depends_enabled $SPELL zlib; then
+ patch -p0 < "$SPELL_DIRECTORY/zlib-conf.patch"
+ fi
+else
+ sedit "s:data/test:share/mysql/data/test:" sql/CMakeLists.txt &&
+ sedit "s:MYSQLD_USER \"mysql\":MYSQLD_USER \"mariadb\":"
scripts/CMakeLists.txt
fi
diff --git a/database/mariadb/PRE_SUB_DEPENDS
b/database/mariadb/PRE_SUB_DEPENDS
index ede9a09..e5dae45 100755
--- a/database/mariadb/PRE_SUB_DEPENDS
+++ b/database/mariadb/PRE_SUB_DEPENDS
@@ -1,6 +1,20 @@
case $THIS_SUB_DEPENDS in
- embedded|EMBEDDED) if list_find "$MADB_OPTS" "--with-embedded-server";
then return 0; fi;;
- innodb|INNODB) if [[ $MADB_ENGINES == *innodb_plugin* || "$MADB_ENGINES"
== "all" ]]; then return 0; fi;;
- NDB) if [[ $MADB_ENGINES == *ndbcluster* || "$MADB_ENGINES" == "all" ]];
then return 0; fi;;
+ embedded|EMBEDDED) if list_find "$MARIADB_OPTS" "--with-embedded-server"
|| \
+ list_find "$MARIADB_OPTS"
"-DWITH_EMBEDDED_SERVER=ON"; then
+ return 0
+ fi
+ ;;
+ innodb|INNODB) if list_find "$MARIADB_ENGINES" "innodb_plugin" || \
+ list_find "$MARIADB_ENGINES" "innobase" || \
+ list_find "$MARIADB_ENGINES" "all"; then
+ return 0
+ fi
+ ;;
+ NDB) if list_find "$MARIADB_ENGINES" "ndbcluster" || \
+ list_find "$MARIADB_ENGINES" "all"; then
+ return 0
+ fi
+ ;;
esac
+
return 1
diff --git a/database/mariadb/REPAIR^all^PRE_SUB_DEPENDS
b/database/mariadb/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..e5dae45
--- /dev/null
+++ b/database/mariadb/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,20 @@
+case $THIS_SUB_DEPENDS in
+ embedded|EMBEDDED) if list_find "$MARIADB_OPTS" "--with-embedded-server"
|| \
+ list_find "$MARIADB_OPTS"
"-DWITH_EMBEDDED_SERVER=ON"; then
+ return 0
+ fi
+ ;;
+ innodb|INNODB) if list_find "$MARIADB_ENGINES" "innodb_plugin" || \
+ list_find "$MARIADB_ENGINES" "innobase" || \
+ list_find "$MARIADB_ENGINES" "all"; then
+ return 0
+ fi
+ ;;
+ NDB) if list_find "$MARIADB_ENGINES" "ndbcluster" || \
+ list_find "$MARIADB_ENGINES" "all"; then
+ return 0
+ fi
+ ;;
+esac
+
+return 1
diff --git a/database/mariadb/SUB_DEPENDS b/database/mariadb/SUB_DEPENDS
index fb44ab1..88bc25a 100755
--- a/database/mariadb/SUB_DEPENDS
+++ b/database/mariadb/SUB_DEPENDS
@@ -1,17 +1,32 @@
case $THIS_SUB_DEPENDS in
- embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." &&
- MADB_OPTS="--with-embedded-server $MADB_OPTS"
;;
- innodb|INNODB) echo "InnoDB storage engine support requested, forcing
it." &&
- if [ "$MADB_ENGINES" == "none" ]; then
- MADB_ENGINES="innodb_plugin"
- else
- MADB_ENGINES="innodb_plugin $MADB_ENGINES"
- fi ;;
- NDB) echo "ndbcluster storage engine support requested, forcing it." &&
- if [ "$MADB_ENGINES" == "none" ]; then
- MADB_ENGINES="ndbcluster"
- else
- MADB_ENGINES="ndbcluster $MADB_ENGINES"
- fi ;;
- *) echo "unknown sub-depends!"; return 1 ;;
+ embedded|EMBEDDED) message "${MESSAGE_COLOR}Embbeded server requested,
forcing it.${DEFAULT_COLOR}" &&
+ if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ list_remove "MARIADB_OPTS"
"-DWITH_EMBEDDED_SERVER=OFF" &&
+ list_add "MARIADB_OPTS" "-DWITH_EMBEDDED_SERVER=ON"
+ else
+ list_remove "MARIADB_OPTS"
"--without-embedded-server" &&
+ list_add "MARIADB_OPTS" "--with-embedded-server"
+ fi
+ ;;
+ innodb|INNODB) message "${MESSAGE_COLOR}InnoDB storage engine support
requested, forcing it.${DEFAULT_COLOR}" &&
+ if list_find "$MARIADB_ENGINES" "none"; then
+ list_remove "MARIADB_ENGINES" "none"
+ fi &&
+
+ if [[ $MARIADB_BRANCH == 5.5 ]]; then
+ list_add "MARIADB_ENGINES" innobase
+ else
+ list_add "MARIADB_ENGINES" innodb_plugin
+ fi
+ ;;
+ NDB) message "${MESSAGE_COLOR}ndbcluster storage engine
support requested, forcing it.${DEFAULT_COLOR}" &&
+ if list_find "$MARIADB_ENGINES" "none"; then
+ list_remove "MARIADB_ENGINES" "none"
+ fi &&
+
+ list_add "MARIADB_ENGINES" "ndbcluster"
+ ;;
+ *) message "${PROBLEM_COLOR}Unknown
sub-depends!${DEFAULT_COLOR}" &&
+ return 1
+ ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3f109537d4be7f5d6f27e612d6559a1623e565b1), Vlad Glagolev, 04/07/2014

Archive powered by MHonArc 2.6.24.

Top of Page