[Commits] 771884b: MDEV-10830 Fix undefined database test error when running mysql_install_db.

Alexey Botchkov holyfoot at askmonty.org
Thu Sep 22 11:38:11 EEST 2016


revision-id: 771884be65a05b4403efaa2e3f8839a149e32d7a (mariadb-10.1.17-17-g771884b)
parent(s): 9e4db083c49e6717ade0818ee7d3ae084c63bfbe
committer: Alexey Botchkov
timestamp: 2016-09-22 12:36:41 +0400
message:

MDEV-10830 Fix undefined database test error when running mysql_install_db.

        The database for the gis-related SP's that created during the
        installation process changed from 'test' to the 'mysql'.

---
 scripts/mysql_install_db.pl.in | 2 +-
 scripts/mysql_install_db.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
index d1b299d..8b99b35 100644
--- a/scripts/mysql_install_db.pl.in
+++ b/scripts/mysql_install_db.pl.in
@@ -508,7 +508,7 @@ if ( open(PIPE, "| $mysqld_install_cmd_line") )
   # FIXME  > /dev/null ?
   if ( open(PIPE, "| $mysqld_install_cmd_line") )
   {
-    print PIPE "use test;\n";
+    print PIPE "use mysql;\n";
     while ( <SQL> )
     {
       print PIPE $_;
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index cd479d9..1daa1bf 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -473,7 +473,7 @@ else
 fi
 
 s_echo "Creating OpenGIS required SP-s..."
-if { echo "use test;"; cat "$maria_add_gis_sp"; } | mysqld_install_cmd_line > /dev/null
+if { echo "use mysql;"; cat "$maria_add_gis_sp"; } | mysqld_install_cmd_line > /dev/null
 then
   s_echo "OK"
 else


More information about the commits mailing list