diff options
| author | Seamus Lee <seamuslee001@gmail.com> | 2016-09-22 19:14:40 +1000 |
|---|---|---|
| committer | holyfoot <holyfoot@mariadb.com> | 2016-09-22 13:14:40 +0400 |
| commit | e387bfafbbb01ccfabeb2beb86efb199ca2ca3ac (patch) | |
| tree | 613c381578776880ee85ef644a0ef70b0ea8a9c9 /scripts | |
| parent | 9f837c6e1a54ea05be92112fe7520ffe0134b260 (diff) | |
| download | mariadb-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')
| -rw-r--r-- | scripts/mysql_install_db.pl.in | 2 | ||||
| -rw-r--r-- | 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 d1b299d9ef5..8b99b3564e4 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 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 |