summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-09-07 14:20:48 +0200
committerunknown <guilhem@mysql.com>2004-09-07 14:20:48 +0200
commit3a476a6e91bcd8f219393b7ec670c4833f534ea3 (patch)
tree769568feea0d199c31ecb446a442101933ff35ee
parent6b1444d7ba70a286f3fc543ab5bc8927106f5638 (diff)
downloadmariadb-git-3a476a6e91bcd8f219393b7ec670c4833f534ea3.tar.gz
clean up at end of test (thanks serg)
mysql-test/r/rpl_set_charset.result: result update mysql-test/t/rpl_set_charset.test: clean up on slave too.
-rw-r--r--mysql-test/r/rpl_set_charset.result1
-rw-r--r--mysql-test/t/rpl_set_charset.test4
2 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/r/rpl_set_charset.result b/mysql-test/r/rpl_set_charset.result
index 7297d80865b..9c7ea73c741 100644
--- a/mysql-test/r/rpl_set_charset.result
+++ b/mysql-test/r/rpl_set_charset.result
@@ -48,5 +48,4 @@ C0C1C2C3C4C5C6C7C8C9CACBCCCDCECF C0
D0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF D0
E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF E0
F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF F0
-drop table t1;
drop database mysqltest1;
diff --git a/mysql-test/t/rpl_set_charset.test b/mysql-test/t/rpl_set_charset.test
index dcfc11bf25e..bd68ce17bbc 100644
--- a/mysql-test/t/rpl_set_charset.test
+++ b/mysql-test/t/rpl_set_charset.test
@@ -34,9 +34,7 @@ use mysqltest1;
select "--- on slave ---";
select hex(a),b from t1 order by b;
connection master;
-drop table t1;
+drop database mysqltest1;
save_master_pos;
connection slave;
sync_with_master;
-connection master;
-drop database mysqltest1;