summaryrefslogtreecommitdiff
path: root/scripts/mysql_install_db.sh
diff options
context:
space:
mode:
authorSeamus Lee <seamuslee001@gmail.com>2016-09-22 19:14:40 +1000
committerholyfoot <holyfoot@mariadb.com>2016-09-22 13:14:40 +0400
commite387bfafbbb01ccfabeb2beb86efb199ca2ca3ac (patch)
tree613c381578776880ee85ef644a0ef70b0ea8a9c9 /scripts/mysql_install_db.sh
parent9f837c6e1a54ea05be92112fe7520ffe0134b260 (diff)
downloadmariadb-git-e387bfafbbb01ccfabeb2beb86efb199ca2ca3ac.tar.gz
MDEV-10830 - Fix undefined database test error when running mysql_install_db (#234)hf-10.1-wsrep-debug
* Fix undefined database test error when running mysql_install_db When using mariaDb in docker mode it can fail as it calls mysql_install_db but as we are going through a slightly different install process the test database has not been created, therefore we should fall back to the mysql database as per https://mariadb.com/kb/en/mariadb/mariadb-10112-mysql_install_db-aborts-on-unkown-file-test/ * Also fix mysql_install_db.pl.in
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r--scripts/mysql_install_db.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index cd479d959c1..1daa1bf58ee 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