database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-04 01:23:45 +03:00
Code Activity

Additional fix for bug#54899

Browse Source 
Fixing the testcase to use the database name
as connected_db instead of 'test' database.
This commit is contained in:
Nirbhay Choubey
2010-12-01 12:25:31 +05:30
parent 2419cec9f1
commit c8310653b4
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/r/mysql.result
View File

@ -294,16 +294,14 @@ Tables_in_test
# Checking --one-database option with non_existent_db # Checking --one-database option with non_existent_db
# specified with USE command # specified with USE command
# #
SHOW TABLES IN test; CREATE DATABASE connected_db;
Tables_in_test SHOW TABLES IN connected_db;
table_in_test Tables_in_connected_db
DROP DATABASE test; table_in_connected_db
CREATE DATABASE test; SHOW TABLES IN connected_db;
SHOW TABLES IN test; Tables_in_connected_db
Tables_in_test table_in_connected_db
table_in_test DROP DATABASE connected_db;
DROP DATABASE test;
CREATE DATABASE test;
End of tests End of tests

29
mysql-test/t/mysql.test
View File

@ -523,35 +523,34 @@ SHOW TABLES IN test;
--echo # specified with USE command --echo # specified with USE command
--echo # --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 --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; USE non_existent_db;
# Following statement should be filtered out. # Following statement should be filtered out.
CREATE TABLE `table_in_non_existent_db`(i INT); CREATE TABLE `table_in_non_existent_db`(i INT);
EOF 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 --write_file $MYSQLTEST_VARDIR/tmp/one_db_2.sql
DROP DATABASE test; DROP DATABASE connected_db;
CREATE DATABASE test; CREATE DATABASE connected_db;
USE non_existent_db; USE non_existent_db;
# Following statements should be filtered out. # Following statements should be filtered out.
CREATE TABLE `table_in_non_existent_db`(i INT); CREATE TABLE `table_in_non_existent_db`(i INT);
USE test; USE connected_db;
# Following statements should not be filtered out. # Following statements should not be filtered out.
CREATE TABLE `table_in_test`(i INT); CREATE TABLE `table_in_connected_db`(i INT);
EOF EOF
--exec $MYSQL --one-database test < $MYSQLTEST_VARDIR/tmp/one_db_1.sql CREATE DATABASE connected_db;
SHOW TABLES IN test; --exec $MYSQL --one-database connected_db < $MYSQLTEST_VARDIR/tmp/one_db_1.sql
DROP DATABASE test; SHOW TABLES IN connected_db;
--echo --echo
CREATE DATABASE test; --exec $MYSQL --one-database connected_db < $MYSQLTEST_VARDIR/tmp/one_db_2.sql
--exec $MYSQL --one-database test < $MYSQLTEST_VARDIR/tmp/one_db_2.sql SHOW TABLES IN connected_db;
SHOW TABLES IN test; DROP DATABASE connected_db;
DROP DATABASE test;
CREATE DATABASE test;
--remove_file $MYSQLTEST_VARDIR/tmp/one_db_1.sql --remove_file $MYSQLTEST_VARDIR/tmp/one_db_1.sql
--remove_file $MYSQLTEST_VARDIR/tmp/one_db_2.sql --remove_file $MYSQLTEST_VARDIR/tmp/one_db_2.sql