From 1bd50ced731ad8999f9371788b6d18f79f40e7cc Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Wed, 31 May 2006 23:34:28 +0200
Subject: Cleanup testcases  - Add  missing drop(s)  - Reset changed variables

NOTE! These kind of problems are easily found with --check-testcases options to mysql-test-run.pl


mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
  Add missing drop table
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Add missing drop table
mysql-test/extra/rpl_tests/rpl_log.test:
  Tables where only dropped on slave, switch to master connection before dropping them
mysql-test/extra/rpl_tests/rpl_multi_update3.test:
  Add missing drop table
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
  Add missing drop database
mysql-test/include/check-testcase.test:
  Add option "--skip-lock-tables" when dumping tables, as noone else is using the tables anyway
mysql-test/r/ndb_cache_multi.result:
  Reset query_cache_size after test on both master and "second" master mysqld
mysql-test/r/partition.result:
  Add missing drop procedure
mysql-test/r/rpl_drop_db.result:
  Add missing drop table
mysql-test/r/rpl_multi_update3.result:
  Add missing drop table
mysql-test/r/rpl_ndb_multi_update3.result:
  Add missing drop table
mysql-test/r/rpl_ndb_sp006.result:
  Add missing drop database
mysql-test/r/rpl_stm_no_op.result:
  Add missing drop table
mysql-test/r/rpl_variables.result:
  Reset slave_net_timeout to it's default value after test
mysql-test/t/ndb_cache_multi.test:
  Reset query_cahche_size after test
mysql-test/t/partition.test:
  Add missing drop procedure
mysql-test/t/rpl_drop_db.test:
  Add missing drop table
mysql-test/t/rpl_stm_no_op.test:
  Add missing drop table
mysql-test/t/rpl_variables.test:
  Reset slave_net_timeout to it's default value after test
---
 mysql-test/include/check-testcase.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test/include/check-testcase.test')

diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test
index 30cb7391f30..5bdbf6cd072 100644
--- a/mysql-test/include/check-testcase.test
+++ b/mysql-test/include/check-testcase.test
@@ -21,13 +21,13 @@ show databases;
 #
 # Dump the "test" database, all it's tables and their data
 #
---exec $MYSQL_DUMP --skip-comments test
+--exec $MYSQL_DUMP --skip-comments --skip-lock-tables test
 
 #
 # Dump the "mysql" database and it's tables
 # Select data separately to add "order by"
 #
---exec $MYSQL_DUMP --skip-comments --no-data mysql
+--exec $MYSQL_DUMP --skip-comments --skip-lock-tables --no-data mysql
 use mysql;
 select * from columns_priv;
 select * from db order by host, db, user;
-- 
cgit v1.2.1