diff options
author | unknown <msvensson@pilot.blaudden> | 2007-04-03 11:36:33 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.blaudden> | 2007-04-03 11:36:33 +0200 |
commit | 48b3529cbedd97d40edddb34431fef11415e937d (patch) | |
tree | 3b960abd13b0fbe00ccd75389b4c33959823709e | |
parent | d423e558f5a2980302cd5aa7ed2704a5af584282 (diff) | |
download | mariadb-git-48b3529cbedd97d40edddb34431fef11415e937d.tar.gz |
Cleanup tables created by test cases
mysql-test/r/crash_commit_before.result:
Cleanup
mysql-test/r/rpl_ignore_table.result:
Cleanup
mysql-test/r/rpl_packet.result:
Cleanup
mysql-test/r/rpl_ssl.result:
Cleanup
mysql-test/t/crash_commit_before.test:
Cleanup
mysql-test/t/rpl_ignore_table.test:
Cleanup
mysql-test/t/rpl_packet.test:
Cleanup
mysql-test/t/rpl_ssl.test:
Cleanup
-rw-r--r-- | mysql-test/r/crash_commit_before.result | 1 | ||||
-rw-r--r-- | mysql-test/r/rpl_ignore_table.result | 1 | ||||
-rw-r--r-- | mysql-test/r/rpl_packet.result | 2 | ||||
-rw-r--r-- | mysql-test/r/rpl_ssl.result | 2 | ||||
-rw-r--r-- | mysql-test/t/crash_commit_before.test | 3 | ||||
-rw-r--r-- | mysql-test/t/rpl_ignore_table.test | 3 | ||||
-rw-r--r-- | mysql-test/t/rpl_packet.test | 6 | ||||
-rw-r--r-- | mysql-test/t/rpl_ssl.test | 6 |
8 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/crash_commit_before.result b/mysql-test/r/crash_commit_before.result index 8eba584c539..34fb3284bae 100644 --- a/mysql-test/r/crash_commit_before.result +++ b/mysql-test/r/crash_commit_before.result @@ -11,3 +11,4 @@ t1 CREATE TABLE `t1` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1 SELECT * FROM t1; a +DROP TABLE t1; diff --git a/mysql-test/r/rpl_ignore_table.result b/mysql-test/r/rpl_ignore_table.result index 9b9146be5a6..e7200b31212 100644 --- a/mysql-test/r/rpl_ignore_table.result +++ b/mysql-test/r/rpl_ignore_table.result @@ -121,6 +121,7 @@ delete from mysql.user where user like "mysqltest%"; delete from mysql.db where user like "mysqltest%"; delete from mysql.columns_priv where user like "mysqltest%"; delete from mysql.tables_priv where user like "mysqltest%"; +delete from mysql.tables_priv where user like "mysqltest%"; DROP TABLE IF EXISTS t5; CREATE TABLE t5 ( word varchar(50) collate utf8_unicode_ci NOT NULL default '' diff --git a/mysql-test/r/rpl_packet.result b/mysql-test/r/rpl_packet.result index 894bc81b08d..a1ec39ece30 100644 --- a/mysql-test/r/rpl_packet.result +++ b/mysql-test/r/rpl_packet.result @@ -24,3 +24,5 @@ INSERT INTO `t1`(`f1`) VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa SHOW STATUS LIKE 'Slave_running'; Variable_name Value Slave_running OFF +drop table t1; +drop table t1; diff --git a/mysql-test/r/rpl_ssl.result b/mysql-test/r/rpl_ssl.result index f68b639b12d..50e2db35165 100644 --- a/mysql-test/r/rpl_ssl.result +++ b/mysql-test/r/rpl_ssl.result @@ -93,3 +93,5 @@ Master_SSL_Cipher Master_SSL_Key MYSQL_TEST_DIR/std_data/client-key.pem Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No +drop user replssl@localhost; +drop table t1; diff --git a/mysql-test/t/crash_commit_before.test b/mysql-test/t/crash_commit_before.test index 5a91cd7a7ad..4e212d81e66 100644 --- a/mysql-test/t/crash_commit_before.test +++ b/mysql-test/t/crash_commit_before.test @@ -30,3 +30,6 @@ COMMIT; SHOW CREATE TABLE t1; SELECT * FROM t1; + + +DROP TABLE t1; diff --git a/mysql-test/t/rpl_ignore_table.test b/mysql-test/t/rpl_ignore_table.test index f678e0a7cc1..fd4ae64165a 100644 --- a/mysql-test/t/rpl_ignore_table.test +++ b/mysql-test/t/rpl_ignore_table.test @@ -136,6 +136,9 @@ delete from mysql.tables_priv where user like "mysqltest%"; connection master; +#BUG27606 +delete from mysql.tables_priv where user like "mysqltest%"; + # # bug#22877 replication character sets get out of sync # using replicate-wild-ignore-table diff --git a/mysql-test/t/rpl_packet.test b/mysql-test/t/rpl_packet.test index db6f475dc94..a1e933e2e88 100644 --- a/mysql-test/t/rpl_packet.test +++ b/mysql-test/t/rpl_packet.test @@ -68,5 +68,11 @@ connection slave; sleep 2; SHOW STATUS LIKE 'Slave_running'; +# cleanup +connection master; +drop table t1; +connection slave; +drop table t1; + # End of tests diff --git a/mysql-test/t/rpl_ssl.test b/mysql-test/t/rpl_ssl.test index 9f25f71525a..5b5f12c91df 100644 --- a/mysql-test/t/rpl_ssl.test +++ b/mysql-test/t/rpl_ssl.test @@ -58,3 +58,9 @@ sync_slave_with_master; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # query_vertical show slave status; + +connection master; +drop user replssl@localhost; +drop table t1; +sync_slave_with_master; + |