database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-10830 - Fix undefined database test error when running mysql_install_db (#234)

Browse Source 
* 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
This commit is contained in:
Seamus Lee
2016-09-22 19:14:40 +10:00
committed by holyfoot
parent 9f837c6e1a
commit e387bfafbb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/mysql_install_db.pl.in
View File

@@ -508,7 +508,7 @@ if ( open(PIPE, "| $mysqld_install_cmd_line") )
# FIXME > /dev/null ? # FIXME > /dev/null ?
if ( open(PIPE, "| $mysqld_install_cmd_line") ) if ( open(PIPE, "| $mysqld_install_cmd_line") )
{ {
print PIPE "use test;\n"; print PIPE "use mysql;\n";
while ( <SQL> ) while ( <SQL> )
{ {
print PIPE $_; print PIPE $_;

2
scripts/mysql_install_db.sh
View File

@@ -473,7 +473,7 @@ else
fi fi
s_echo "Creating OpenGIS required SP-s..." 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 then
s_echo "OK" s_echo "OK"
else else