diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-24 19:30:32 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-08-24 19:30:32 -0400 |
| commit | c309e99ff9b48c1736ff468e72153048c4b56561 (patch) | |
| tree | 1fb9e8831597007bcfa9e7ea2b2aadb717b962cd /scripts | |
| parent | 8b09db8bfb81f1e7695cfcfa6ce2bec45247171f (diff) | |
| parent | 5bbe929d706e26cb3f9b291da6009526a17b1545 (diff) | |
| download | mariadb-git-c309e99ff9b48c1736ff468e72153048c4b56561.tar.gz | |
Merge branch '10.0' into 10.0-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 82ea1b60a17..2c3b2f8dc8c 100644 --- a/scripts/mysql_secure_installation.sh +++ b/scripts/mysql_secure_installation.sh @@ -332,7 +332,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 |