diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2016-07-15 23:51:30 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2016-07-15 23:51:30 +0300 |
| commit | 5cf49cdf92bb57c2e20f72422a22768be8c7a8a8 (patch) | |
| tree | e52074206a714f69476c5196cbc55a4189d891e8 /scripts | |
| parent | 4e19aa386493fcf0613049b47cbb9b151e2d3e8d (diff) | |
| download | mariadb-git-5cf49cdf92bb57c2e20f72422a22768be8c7a8a8.tar.gz | |
MDEV-10248 Cannot Remove Test Tables
While dropping the test database, use IF EXISTS to avoid bogus errors
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 |