diff options
author | Nirbhay Choubey <nirbhay.choubey@sun.com> | 2010-12-01 12:28:21 +0530 |
---|---|---|
committer | Nirbhay Choubey <nirbhay.choubey@sun.com> | 2010-12-01 12:28:21 +0530 |
commit | 45e17739d441f418fc0727ac3cc10f17c17b341e (patch) | |
tree | 2c595c62c2cbf142433c6ea935b0cb4ea140fed7 /mysql-test/t/mysql.test | |
parent | 2f0c4841a4c5837b2c2ba4f2e9748e2378ad32de (diff) | |
parent | 2d81ad5be51cb2ec6921e681a6f1020e1cfa8d60 (diff) | |
download | mariadb-git-45e17739d441f418fc0727ac3cc10f17c17b341e.tar.gz |
Merging from mysql-5.1-bugteam
Diffstat (limited to 'mysql-test/t/mysql.test')
-rw-r--r-- | mysql-test/t/mysql.test | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index 973af8e580a..7b5b2a0ded0 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -536,35 +536,34 @@ SHOW TABLES IN test; --echo # specified with USE command --echo # -# CASE 1 : When 'test' database exists and passed at commandline. +# CASE 1 : When 'connected_db' database exists and passed at commandline. --write_file $MYSQLTEST_VARDIR/tmp/one_db_1.sql -CREATE TABLE `table_in_test`(i INT); +CREATE TABLE `table_in_connected_db`(i INT); USE non_existent_db; # Following statement should be filtered out. CREATE TABLE `table_in_non_existent_db`(i INT); EOF -# CASE 2 : When 'test' database exists but dropped and recreated in load file. +# CASE 2 : When 'connected_db' database exists but dropped and recreated in +# load file. --write_file $MYSQLTEST_VARDIR/tmp/one_db_2.sql -DROP DATABASE test; -CREATE DATABASE test; +DROP DATABASE connected_db; +CREATE DATABASE connected_db; USE non_existent_db; # Following statements should be filtered out. CREATE TABLE `table_in_non_existent_db`(i INT); -USE test; +USE connected_db; # Following statements should not be filtered out. -CREATE TABLE `table_in_test`(i INT); +CREATE TABLE `table_in_connected_db`(i INT); EOF ---exec $MYSQL --one-database test < $MYSQLTEST_VARDIR/tmp/one_db_1.sql -SHOW TABLES IN test; -DROP DATABASE test; +CREATE DATABASE connected_db; +--exec $MYSQL --one-database connected_db < $MYSQLTEST_VARDIR/tmp/one_db_1.sql +SHOW TABLES IN connected_db; --echo -CREATE DATABASE test; ---exec $MYSQL --one-database test < $MYSQLTEST_VARDIR/tmp/one_db_2.sql -SHOW TABLES IN test; -DROP DATABASE test; -CREATE DATABASE test; +--exec $MYSQL --one-database connected_db < $MYSQLTEST_VARDIR/tmp/one_db_2.sql +SHOW TABLES IN connected_db; +DROP DATABASE connected_db; --remove_file $MYSQLTEST_VARDIR/tmp/one_db_1.sql --remove_file $MYSQLTEST_VARDIR/tmp/one_db_2.sql |