It includes all major open source storage engines,
including the Maria storage engine.
diff --git a/database/mariadb/FINAL b/database/mariadb/FINAL
new file mode 100755
index 0000000..9e21478
--- /dev/null
+++ b/database/mariadb/FINAL
@@ -0,0 +1,4 @@
+ 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"
+ message "for more information${DEFAULT_COLOR}"
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 1be87d8..25edfb5 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,16 @@
+2010-11-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.2.3 (latest stable); removed useless
+ SOURCE2_IGNORE; set correct mirrors; fixed ENTERED, descriptions
+ * BUILD: removed dirty hacks, fixed localstatedir; removed incorrect
+ configure flags; cleaned up
+ * CONFIGURE: added more storage engines to select
+ * DEPENDS: removed old checks from mysql; added sphinx dependency
+ * INSTALL: increased verbosity level; quoting paths
+ * POST_INSTALL: removed, we don't do/force anything for SA
+ * FINAL: added, as informational replacement of POST_INSTALL
+ * PREPARE: s:MySQL:MariaDB:
+ * {PRE_}SUB_DEPENDS: fixed variable names, so they can actually work
+
2010-05-19 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* DETAILS: updated spell to 5.1.47, updating mirrors
@@ -11,4 +24,3 @@
2010-04-02 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* spell created
-
diff --git a/database/mariadb/INSTALL b/database/mariadb/INSTALL
index 734ead5..1ae9745 100755
--- a/database/mariadb/INSTALL
+++ b/database/mariadb/INSTALL
@@ -11,4 +11,5 @@ if [[ $MARIA_BENCH == n ]]; then
rm -fr "${INSTALL_ROOT}/usr/share/mysql/sql-bench"
fi &&
-install -m 0644 $SCRIPT_DIRECTORY/profile.d/mariadb
$INSTALL_ROOT/etc/sysconfig
+install -vm 0644 "$SPELL_DIRECTORY/profile.d/mariadb" \
+ "$INSTALL_ROOT/etc/sysconfig"
diff --git a/database/mariadb/POST_INSTALL b/database/mariadb/POST_INSTALL
deleted file mode 100755
index 16144c3..0000000
--- a/database/mariadb/POST_INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-default_post_install &&
-chown mariadb.mariadb /var/lib/mariadb
-${INSTALL_ROOT}/usr/bin/mysql_install_db --user=mariadb
--datadir=/var/lib/mariadb
diff --git a/database/mariadb/PREPARE b/database/mariadb/PREPARE
index ba03d1c..c605187 100755
--- a/database/mariadb/PREPARE
+++ b/database/mariadb/PREPARE
@@ -1,2 +1,2 @@
-config_query MARIA_TESTS "Install MySQL testing utilities?" n &&
-config_query MARIA_BENCH "Install MySQL benchmarking utilities?" n
+config_query MARIA_TESTS "Install MariaDB testing utilities?" n &&
+config_query MARIA_BENCH "Install MariaDB benchmarking utilities?" n
diff --git a/database/mariadb/PRE_SUB_DEPENDS
b/database/mariadb/PRE_SUB_DEPENDS
index b79f83d..414ee98 100755
--- a/database/mariadb/PRE_SUB_DEPENDS
+++ b/database/mariadb/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- embedded|EMBEDDED) if [ $MSQL_EMBED == "--with-embedded-server" ]; then
return 0; fi;;
- innodb|INNODB) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" ==
"all" ]]; then return 0; fi;;
+ embedded|EMBEDDED) if [ $MADB_EMBED == "--with-embedded-server" ]; then
return 0; fi;;
+ innodb|INNODB) if [[ $MADB_ENGINES == *innodb_plugin* || "$MADB_ENGINES"
== "all" ]]; then return 0; fi;;
esac
return 1
diff --git a/database/mariadb/SUB_DEPENDS b/database/mariadb/SUB_DEPENDS
index b31384a..b6b3018 100755
--- a/database/mariadb/SUB_DEPENDS
+++ b/database/mariadb/SUB_DEPENDS
@@ -1,11 +1,11 @@
case $THIS_SUB_DEPENDS in
embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." &&
- MSQL_EMBED="--with-embedded-server" ;;
+ MADB_EMBED="--with-embedded-server" ;;
innodb|INNODB) echo "InnoDB storage engine support requested, forcing
it." &&
- if [ "$MSQL_ENGINES" == "none" ]; then
- MSQL_ENGINES="InnoDB"
+ if [ "$MADB_ENGINES" == "none" ]; then
+ MADB_ENGINES="innodb_plugin"
else
- MSQL_ENGINES="$MSQL_ENGINES InnoDB"
+ MADB_ENGINES="innodb_plugin $MADB_ENGINES"
fi ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (83795e972679827287de6fef01666ed66b864f72),
Vlad Glagolev, 11/11/2010