From 8b8647ff42757f0908340b054ec3d74c56ebfcb0 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 Nov 2006 10:23:27 +0100 Subject: Cleanup after test cases mysql-test/r/init_connect.result: Restore global variable to the value it's set to when server is started mysql-test/r/key_cache.result: Restore global variable values to original mysql-test/r/mysqldump.result: Drop the user that was created. Specifying "drop user myDB_user" is equal to "drop user myDB_user@%" mysql-test/r/rpl_deadlock.result: Restore global variable values to original mysql-test/r/rpl_drop_db.result: Remove the conflicting file and drop database mysqltest1 before test exits mysql-test/r/rpl_ignore_revoke.result: As changes to mysql.* are ignored - explicitly delete the user on slave mysql-test/r/rpl_init_slave.result: Restore global variable values to original mysql-test/r/rpl_max_relay_size.result: Restore global variable values to original mysql-test/r/rpl_sp.result: Restore global variable values to original mysql-test/r/rpl_timezone.result: Restore global variable values to original mysql-test/r/rpl_variables.result: Restore global variable values to original mysql-test/r/view_grant.result: Use same user in all places in the same test "readonly" is equal to "readonly@%" not "readonly@localhost" mysql-test/t/init_connect.test: Restore global variable to the value it's set to when server is started mysql-test/t/key_cache.test: Restore global variable values to original mysql-test/t/mysqldump.test: Drop the user that was created. Specifying "drop user myDB_user" is equal to "drop user myDB_user@%" mysql-test/t/rpl_deadlock.test: Restore global variable values to original mysql-test/t/rpl_drop_db.test: Remove the conflicting file and drop database mysqltest1 before test exits mysql-test/t/rpl_ignore_revoke.test: As changes to mysql.* are ignored - explicitly delete the user on slave mysql-test/t/rpl_init_slave.test: Restore global variable values to original mysql-test/t/rpl_max_relay_size.test: Restore global variable values to original mysql-test/t/rpl_sp.test: Restore global variable values to original mysql-test/t/rpl_timezone.test: Restore global variable values to original mysql-test/t/rpl_variables.test: Restore global variable values to original mysql-test/t/view_grant.test: Use same user in all places in the same test "readonly" is equal to "readonly@%" not "readonly@localhost" --- mysql-test/t/rpl_variables.test | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mysql-test/t/rpl_variables.test') diff --git a/mysql-test/t/rpl_variables.test b/mysql-test/t/rpl_variables.test index 57ae2b9c3c4..d0801e524e4 100644 --- a/mysql-test/t/rpl_variables.test +++ b/mysql-test/t/rpl_variables.test @@ -1,5 +1,8 @@ source include/master-slave.inc; +# Init for rstore of variable values +set @my_slave_net_timeout =@@global.slave_net_timeout; + set global slave_net_timeout=100; set global sql_slave_skip_counter=100; @@ -12,3 +15,6 @@ show variables like 'slave_load_tmpdir'; # We just set some arbitrary values in variables-master.opt so we can test # that a list of values works correctly show variables like 'slave_skip_errors'; + +# Restore touched values +set global slave_net_timeout =@my_slave_net_timeout; -- cgit v1.2.1