diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-10 10:34:54 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-10 10:34:54 -0400 |
| commit | 38a0def80588dd8a093af3e225101365c74e0faa (patch) | |
| tree | 57ac2c3d59b2e7fefc37fdc9763715ee74d90ca2 /scripts | |
| parent | 44e3046d3b09a21e21295979d6ddad9f332ebadd (diff) | |
| parent | 5ad02062d928cccbd29c0a2db6f0f7ceb33195d1 (diff) | |
| download | mariadb-git-38a0def80588dd8a093af3e225101365c74e0faa.tar.gz | |
Merge tag 'mariadb-5.5.51' into 5.5-galera
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_secure_installation.pl.in | 2 | ||||
| -rw-r--r-- | scripts/mysql_secure_installation.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in index 188a6bd7104..32331c3d601 100644 --- a/scripts/mysql_secure_installation.pl.in +++ b/scripts/mysql_secure_installation.pl.in @@ -217,7 +217,7 @@ sub remove_remote_root { sub remove_test_database { print " - Dropping test database...\n"; - if (do_query("DROP DATABASE test;")) { + if (do_query("DROP DATABASE IF EXISTS test;")) { print " ... Success!\n"; } else { print " ... Failed! Not critical, keep moving...\n"; diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh index 9e9bce9fa87..7fb8b73ef8f 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -324,7 +324,7 @@ remove_remote_root() { remove_test_database() { echo " - Dropping test database..." - do_query "DROP DATABASE test;" + do_query "DROP DATABASE IF EXISTS test;" if [ $? -eq 0 ]; then echo " ... Success!" else |