summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/events_logs_tests.test2
-rw-r--r--mysql-test/t/events_scheduling.test1
-rw-r--r--mysql-test/t/insert.test2
-rw-r--r--mysql-test/t/rpl_read_only.test2
-rw-r--r--mysql-test/t/rpl_row_NOW.test1
-rw-r--r--mysql-test/t/rpl_row_USER.test4
-rw-r--r--mysql-test/t/rpl_row_basic_11bugs.test6
-rw-r--r--mysql-test/t/rpl_row_func002.test1
-rw-r--r--mysql-test/t/rpl_row_sp008.test1
-rw-r--r--mysql-test/t/rpl_row_sp012.test1
-rw-r--r--mysql-test/t/rpl_row_view01.test1
-rw-r--r--mysql-test/t/rpl_slave_status.test1
-rw-r--r--mysql-test/t/rpl_switch_stm_row_mixed.test8
-rw-r--r--mysql-test/t/sp.test1
-rw-r--r--mysql-test/t/varbinary.test1
-rw-r--r--mysql-test/t/variables.test8
16 files changed, 36 insertions, 5 deletions
diff --git a/mysql-test/t/events_logs_tests.test b/mysql-test/t/events_logs_tests.test
index e45fea1dfad..64ce4a5c3df 100644
--- a/mysql-test/t/events_logs_tests.test
+++ b/mysql-test/t/events_logs_tests.test
@@ -104,3 +104,5 @@ 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;
diff --git a/mysql-test/t/events_scheduling.test b/mysql-test/t/events_scheduling.test
index 0002cf9f29f..e3b55685e65 100644
--- a/mysql-test/t/events_scheduling.test
+++ b/mysql-test/t/events_scheduling.test
@@ -63,3 +63,4 @@ DROP TABLE table_2;
DROP TABLE table_3;
DROP TABLE table_4;
DROP DATABASE events_test;
+SET GLOBAL event_scheduler=OFF;
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index 0a6b081e7c3..6c076fa6dc0 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -248,3 +248,5 @@ insert ignore into t1 values(NULL,100),(NULL,110),(NULL,120);
insert ignore into t1 values(NULL,10),(NULL,20),(NULL,110),(NULL,120),(NULL,100),(NULL,90);
insert ignore into t1 values(NULL,130),(NULL,140),(500,110),(550,120),(450,100),(NULL,150);
select * from t1 order by id;
+
+drop table t1;
diff --git a/mysql-test/t/rpl_read_only.test b/mysql-test/t/rpl_read_only.test
index aec32245057..62864b62a28 100644
--- a/mysql-test/t/rpl_read_only.test
+++ b/mysql-test/t/rpl_read_only.test
@@ -108,4 +108,6 @@ drop user test;
drop table t1;
drop table t2;
sync_slave_with_master;
+set global read_only=0;
+
diff --git a/mysql-test/t/rpl_row_NOW.test b/mysql-test/t/rpl_row_NOW.test
index 31d392b735f..d0272b35c1f 100644
--- a/mysql-test/t/rpl_row_NOW.test
+++ b/mysql-test/t/rpl_row_NOW.test
@@ -56,6 +56,7 @@ connection master;
# lets cleanup
DROP TABLE IF EXISTS mysqltest1.t1;
DROP FUNCTION mysqltest1.f1;
+DROP DATABASE mysqltest1;
# Lets compare. Note: If they match test will pass, if they do not match
# the test will show that the diff statement failed and not reject file
diff --git a/mysql-test/t/rpl_row_USER.test b/mysql-test/t/rpl_row_USER.test
index a099a35ec27..7b13ebc50ee 100644
--- a/mysql-test/t/rpl_row_USER.test
+++ b/mysql-test/t/rpl_row_USER.test
@@ -2,7 +2,7 @@
# Original Author: JBM #
# Original Date: Aug/18/2005 #
#############################################################################
-# TEST: To test the UUID() in rbr #
+# TEST: To test the USER() and CURRENT_USER() in rbr #
#############################################################################
# Change Author: JBM
# Change Date: 2006-01-16
@@ -52,6 +52,8 @@ connection master;
DROP DATABASE mysqltest1;
REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
+DROP USER tester@'%';
+DROP USER ''@'localhost%';
sync_slave_with_master;
diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/t/rpl_row_basic_11bugs.test
index 5b28af75d33..348b6d45f52 100644
--- a/mysql-test/t/rpl_row_basic_11bugs.test
+++ b/mysql-test/t/rpl_row_basic_11bugs.test
@@ -92,6 +92,8 @@ INSERT INTO t1 VALUES (7),(8),(9);
sync_slave_with_master;
SELECT * FROM t1;
+SET GLOBAL QUERY_CACHE_SIZE=0;
+
# Bug#22550: Replication of BIT columns failing
--echo ================ Test for BUG#22550 ================
--disable_query_log
@@ -113,3 +115,7 @@ UPDATE t1 SET a=0 WHERE b=2;
SELECT HEX(a),b FROM t1;
sync_slave_with_master;
SELECT HEX(a),b FROM t1;
+
+connection master;
+DROP TABLE t1;
+sync_slave_with_master;
diff --git a/mysql-test/t/rpl_row_func002.test b/mysql-test/t/rpl_row_func002.test
index ce3fc124387..44a704bfbc5 100644
--- a/mysql-test/t/rpl_row_func002.test
+++ b/mysql-test/t/rpl_row_func002.test
@@ -90,6 +90,7 @@ connection master;
# Cleanup
DROP FUNCTION test.f1;
DROP TABLE test.t1;
+DROP TABLE test.t2;
sync_slave_with_master;
# the test will show that the diff statement failed and no reject file
diff --git a/mysql-test/t/rpl_row_sp008.test b/mysql-test/t/rpl_row_sp008.test
index 8e8e709a2d9..b1295820c99 100644
--- a/mysql-test/t/rpl_row_sp008.test
+++ b/mysql-test/t/rpl_row_sp008.test
@@ -51,6 +51,7 @@ SELECT * FROM test.t2;
connection master;
DROP PROCEDURE IF EXISTS test.p1;
DROP TABLE IF EXISTS test.t1;
+DROP TABLE IF EXISTS test.t2;
sync_slave_with_master;
# End of 5.0 test case
diff --git a/mysql-test/t/rpl_row_sp012.test b/mysql-test/t/rpl_row_sp012.test
index 5b6fc139577..3a8d295121c 100644
--- a/mysql-test/t/rpl_row_sp012.test
+++ b/mysql-test/t/rpl_row_sp012.test
@@ -68,6 +68,7 @@ DROP PROCEDURE IF EXISTS test.p3;
DROP PROCEDURE IF EXISTS test.p2;
DROP TABLE IF EXISTS test.t1;
DROP TABLE IF EXISTS test.t2;
+DROP USER user1@localhost;
sync_slave_with_master;
# End of 5.0 test case
diff --git a/mysql-test/t/rpl_row_view01.test b/mysql-test/t/rpl_row_view01.test
index 895a922fef8..634e3c30cc6 100644
--- a/mysql-test/t/rpl_row_view01.test
+++ b/mysql-test/t/rpl_row_view01.test
@@ -82,6 +82,7 @@ DROP TABLE IF EXISTS mysqltest1.t3;
DROP TABLE IF EXISTS mysqltest1.t1;
DROP TABLE IF EXISTS mysqltest1.t2;
DROP TABLE IF EXISTS mysqltest1.t4;
+DROP DATABASE mysqltest1;
sync_slave_with_master;
# End of 5.1 test case
diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test
index f98cc7a7d14..32320a50656 100644
--- a/mysql-test/t/rpl_slave_status.test
+++ b/mysql-test/t/rpl_slave_status.test
@@ -49,6 +49,7 @@ show slave status;
# Cleanup (Note that slave IO thread is not running)
connection slave;
drop table t1;
+delete from mysql.user where user='rpl';
connection master;
drop table t1;
diff --git a/mysql-test/t/rpl_switch_stm_row_mixed.test b/mysql-test/t/rpl_switch_stm_row_mixed.test
index 2f29ef1d03a..deec99ad9bc 100644
--- a/mysql-test/t/rpl_switch_stm_row_mixed.test
+++ b/mysql-test/t/rpl_switch_stm_row_mixed.test
@@ -8,6 +8,10 @@ create database mysqltest1;
--enable_warnings
use mysqltest1;
+# Save binlog format
+set @my_binlog_format= @@global.binlog_format;
+
+# Set binlog format to row
set session binlog_format=row;
set global binlog_format=row;
@@ -542,3 +546,7 @@ diff_files $MYSQLTEST_VARDIR/tmp/rpl_switch_stm_row_mixed_master.sql $MYSQLTEST_
drop database mysqltest1;
sync_slave_with_master;
+
+connection master;
+# Restore binlog format setting
+set global binlog_format =@my_binlog_format;
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 8054d2fd4be..efd562e8b27 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -6755,6 +6755,7 @@ SELECT bug23760_rc_test(ROW_COUNT())|
DROP TABLE bug23760, bug23760_log|
DROP PROCEDURE bug23760_update_log|
DROP PROCEDURE bug23760_test_row_count|
+DROP PROCEDURE bug23760_test_row_count2|
DROP FUNCTION bug23760_rc_test|
#
diff --git a/mysql-test/t/varbinary.test b/mysql-test/t/varbinary.test
index 2f0c1c83e84..2d055920c22 100644
--- a/mysql-test/t/varbinary.test
+++ b/mysql-test/t/varbinary.test
@@ -83,4 +83,5 @@ insert into t1 values("aaa ");
select length(a) from t1;
alter table t1 modify a varchar(255);
select length(a) from t1;
+drop table t1;
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 16fcae380b2..d381ed62bc7 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -18,12 +18,11 @@ set @my_key_buffer_size =@@global.key_buffer_size;
set @my_max_binlog_cache_size =@@global.max_binlog_cache_size;
set @my_max_binlog_size =@@global.max_binlog_size;
set @my_max_connect_errors =@@global.max_connect_errors;
+set @my_max_connections =@@global.max_connections;
set @my_max_delayed_threads =@@global.max_delayed_threads;
set @my_max_heap_table_size =@@global.max_heap_table_size;
set @my_max_insert_delayed_threads=@@global.max_insert_delayed_threads;
set @my_max_join_size =@@global.max_join_size;
-set @my_max_user_connections =@@global.max_user_connections;
-set @my_max_write_lock_count =@@global.max_write_lock_count;
set @my_myisam_data_pointer_size =@@global.myisam_data_pointer_size;
set @my_net_buffer_length =@@global.net_buffer_length;
set @my_net_write_timeout =@@global.net_write_timeout;
@@ -718,12 +717,13 @@ set global key_buffer_size =@my_key_buffer_size;
set global max_binlog_cache_size =default; #@my_max_binlog_cache_size;
set global max_binlog_size =@my_max_binlog_size;
set global max_connect_errors =@my_max_connect_errors;
+set global max_connections =@my_max_connections;
set global max_delayed_threads =@my_max_delayed_threads;
set global max_heap_table_size =@my_max_heap_table_size;
set global max_insert_delayed_threads=@my_max_insert_delayed_threads;
set global max_join_size =@my_max_join_size;
-set global max_user_connections =@my_max_user_connections;
-set global max_write_lock_count =@my_max_write_lock_count;
+set global max_user_connections =default;
+set global max_write_lock_count =default;
set global myisam_data_pointer_size =@my_myisam_data_pointer_size;
set global net_buffer_length =@my_net_buffer_length;
set global net_write_timeout =@my_net_write_timeout;
View Lorry Controller Status