Commit 245b9ad4 authored by unknown's avatar unknown
Browse files

Make sure tests drops objects created and restore variables to default 


mysql-test/extra/rpl_tests/rpl_row_func003.test:
  Fix spelling error
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Restore sql_mode after test
mysql-test/r/events_logs_tests.result:
  Turn even_scheduleroff before test ends
mysql-test/r/events_scheduling.result:
  Turn even_scheduleroff before test ends
mysql-test/r/insert.result:
  Drop tables t1 before test ends
mysql-test/r/rpl_read_only.result:
  Set read_only flag back to default
mysql-test/r/rpl_row_NOW.result:
  Drop database mysqltest1 before test ends
mysql-test/r/rpl_row_USER.result:
  Drop users created by test
mysql-test/r/rpl_row_basic_11bugs.result:
  Drop table and set query_cache_size back to default
mysql-test/r/rpl_row_func002.result:
  Drop table created by test
mysql-test/r/rpl_row_sp008.result:
  Drop table created by test
mysql-test/r/rpl_row_sp012.result:
  Drop user created by test
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Restore sql_mode
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Restore sql_mode
mysql-test/r/rpl_row_tabledefs_7ndb.result:
  Restore sql_mode
mysql-test/r/rpl_row_view01.result:
  Drop database created by test
mysql-test/r/rpl_slave_status.result:
  Remove created users
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Reset binlog_format to default
mysql-test/r/sp.result:
  Drop procedure created by test
mysql-test/r/varbinary.result:
  Drop table created by test
mysql-test/r/variables.result:
  Reset changed variables to their defaults
mysql-test/t/events_logs_tests.test:
  Turn off event_scheduler before test ends
mysql-test/t/events_scheduling.test:
  Turn off event_scheduler
mysql-test/t/insert.test:
  Drop table created by test
mysql-test/t/rpl_read_only.test:
  Reset read_only flag
mysql-test/t/rpl_row_NOW.test:
  Drop db created by test
mysql-test/t/rpl_row_USER.test:
  Drop users created
mysql-test/t/rpl_row_basic_11bugs.test:
  Drop tables created by test
mysql-test/t/rpl_row_func002.test:
  Drop table created by test
mysql-test/t/rpl_row_sp008.test:
  Drop table created by test
mysql-test/t/rpl_row_sp012.test:
  Drop user created by test
mysql-test/t/rpl_row_view01.test:
  Drop db created by test
mysql-test/t/rpl_slave_status.test:
  Remove users created by test
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Reset binlog_format
mysql-test/t/sp.test:
  Drop procedure created by test
mysql-test/t/varbinary.test:
  Drop tables created by test
mysql-test/t/variables.test:
  Restore variables to their default before test ends
parent 4000a6a6

mysql-test/extra/rpl_tests/rpl_row_func003.test

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ SET AUTOCOMMIT=1; 
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/func003_slave.sql



# First lets cleanupi

# First lets cleanup

DROP FUNCTION test.f1;

DROP TABLE test.t1;

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t9; 
--enable_warnings

sync_slave_with_master;

STOP SLAVE;

SET @my_sql_mode= @@global.sql_mode;

SET GLOBAL SQL_MODE='STRICT_ALL_TABLES';

START SLAVE;
@@ -238,3 +239,6 @@ DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef; 
DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9;

--enable_warnings

sync_slave_with_master;



# Restore sql_mode

SET @@global.sql_mode= @my_sql_mode;

mysql-test/r/events_logs_tests.result

+1 −0
Original line number Diff line number Diff line
@@ -97,3 +97,4 @@ DROP TABLE slow_event_test; 
SET GLOBAL  long_query_time =@old_global_long_query_time;

SET SESSION long_query_time =@old_session_long_query_time;

DROP DATABASE events_test;

SET GLOBAL event_scheduler=off;

mysql-test/r/events_scheduling.result

+1 −0
Original line number Diff line number Diff line
@@ -83,3 +83,4 @@ DROP TABLE table_2; 
DROP TABLE table_3;

DROP TABLE table_4;

DROP DATABASE events_test;

SET GLOBAL event_scheduler=OFF;

mysql-test/r/insert.result

+1 −0
Original line number Diff line number Diff line
@@ -383,3 +383,4 @@ id data 
7	130

8	140

9	150

drop table t1;