New commits:
commit 37a895f8d3de7898e3932d521f8e3172679f2213
Author: David C. Haley <khoralin AT gmail.com>
Commit: David C. Haley <khoralin AT gmail.com>
mariadb: fixed "all" and "none" engine selection handling.
diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
index 39b0f88..06bd4b8 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -28,7 +28,13 @@ if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH ==
10.1 ]]; then
$OPTS" &&
if [[ $MARIADB_ENGINES == none ]] || [[ $MARIADB_ENGINES == all ]]; then
- OPTS="-DWITH_${MARIADB_ENGINES^^} $OPTS"
+ if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then
+ for engine in $MARIADB_ENGINES; do
+ OPTS="-DWITH_${engine^^}_STORAGE_ENGINE=OFF $OPTS"
+ done
+ else
+ OPTS="-DWITH_${MARIADB_ENGINES^^} $OPTS"
+ fi
else
for engine in $MARIADB_ENGINES; do
OPTS="-DWITH_${engine^^}_STORAGE_ENGINE=ON $OPTS"
diff --git a/database/mariadb/CONFIGURE b/database/mariadb/CONFIGURE
index 01739a5..2074a38 100755
--- a/database/mariadb/CONFIGURE
+++ b/database/mariadb/CONFIGURE
@@ -113,7 +113,11 @@ config_query_multi MARIADB_ENGINES "What storage engines
to build?" \
$MARIADB_ENGINES_LIST &&
if list_find "$MARIADB_ENGINES" "all"; then
- MARIADB_ENGINES="all"
+ if [[ $MARIADB_BRANCH == 5.5 ]] || [[ $MARIADB_BRANCH == 10.1 ]]; then
+ MARIADB_ENGINES=MARIADB_ENGINES_LIST
+ else
+ MARIADB_ENGINES="all"
+ fi
elif list_find "$MARIADB_ENGINES" "none"; then
MARIADB_ENGINES="none"
fi &&
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 3fa3b9e..e3e6da9 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2016-09-07 David C. Haley <khoralin AT gmail.com>
+ * BUILD: Correctly handle "none" engine selection.
+ * CONFIGURE: Correctly handle "all" engine selection.
+
2016-08-19 David C. Haley <khoralin AT gmail.com>
* DETAILS: 10.1 branch, updated to 10.1.16, security_patch++
5.5 branch, updated to 5.5.51, security_patch++
[SM-Commit] GIT changes to master grimoire by David C. Haley (37a895f8d3de7898e3932d521f8e3172679f2213),
David C. Haley, 09/07/2016