summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_loaddata.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-01-27 10:49:07 +0100
committerunknown <msvensson@neptunus.(none)>2006-01-27 10:49:07 +0100
commit7ee0c6b5cfa14d2f3ab9655d937ac20c0da0506b (patch)
treeef0edf4b9c14460884d85ebaa6212e67e892a336 /mysql-test/t/rpl_loaddata.test
parentf300c891870c3b0874c3c4a1cfb70d116af17457 (diff)
parent313ea47da4c20a89a5d1178ae4bec913126ad38f (diff)
downloadmariadb-git-7ee0c6b5cfa14d2f3ab9655d937ac20c0da0506b.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/rpl000001.result: Auto merged mysql-test/r/rpl_loaddata.result: Auto merged mysql-test/r/rpl_loaddata_rule_m.result: Auto merged mysql-test/r/rpl_loaddata_rule_s.result: Auto merged mysql-test/r/rpl_misc_functions.result: Auto merged mysql-test/r/rpl_replicate_do.result: Auto merged mysql-test/r/sp-security.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/r/view_grant.result: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_loaddata_rule_m.test: Auto merged mysql-test/t/rpl_loaddata_rule_s.test: Auto merged mysql-test/t/rpl_misc_functions.test: Auto merged mysql-test/t/rpl_replicate_do.test: Auto merged mysql-test/t/sp-security.test: Auto merged mysql-test/t/trigger-compat.test: Auto merged mysql-test/r/trigger-compat.result: Merge
Diffstat (limited to 'mysql-test/t/rpl_loaddata.test')
-rw-r--r--mysql-test/t/rpl_loaddata.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test
index 2126c88f5c7..5ebdec6f761 100644
--- a/mysql-test/t/rpl_loaddata.test
+++ b/mysql-test/t/rpl_loaddata.test
@@ -149,5 +149,6 @@ wait_for_slave_to_stop;
drop table t2;
connection master;
drop table t2;
-
+drop table t1;
+sync_with_master;
# End of 4.1 tests