From 914ae26cf926332a91f838bc274db82f62981445 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 12 Feb 2008 17:22:04 +0100 Subject: [PATCH] Moved mysql-test/suite/rpl/rpl_variables.test into mysql-test/t/variables.test, because: - mysql-test/suite/rpl/t/rpl_variables.test does not replicate anything, so should not be in the rpl suite. - mysql-test/t/variables.test is the place for testing variable-related problems and features. - I will soon commit a patch containing a test case that tests replication of variables. It would be good if I could call the test case mysql-test/suite/rpl/t/rpl_variables.test. I'm making place for that now. mysql-test/t/variables-master.opt: Rename: mysql-test/suite/rpl/t/rpl_variables-master.opt -> mysql-test/t/variables-master.opt BitKeeper/deleted/.del-rpl_variables.test: Delete: mysql-test/suite/rpl/t/rpl_variables.test BitKeeper/deleted/.del-rpl_variables.result: Delete: mysql-test/suite/rpl/r/rpl_variables.result mysql-test/r/variables.result: Moved mysql-test/suite/rpl/t/rpl_variables.test into mysql-test/t/variables.test . Result file needs to be updated. mysql-test/t/variables.test: Moved mysql-test/suite/rpl/t/rpl_variables.test into mysql-test/t/variables.test . --- mysql-test/r/variables.result | 14 +++++++++++++ mysql-test/suite/rpl/r/rpl_variables.result | 19 ------------------ mysql-test/suite/rpl/t/rpl_variables.test | 20 ------------------- .../variables-master.opt} | 0 mysql-test/t/variables.test | 19 ++++++++++++++++++ 5 files changed, 33 insertions(+), 39 deletions(-) delete mode 100644 mysql-test/suite/rpl/r/rpl_variables.result delete mode 100644 mysql-test/suite/rpl/t/rpl_variables.test rename mysql-test/{suite/rpl/t/rpl_variables-master.opt => t/variables-master.opt} (100%) diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index e5c3c860c93..395ba0eab48 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -22,6 +22,7 @@ set @my_query_cache_limit =@@global.query_cache_limit; set @my_query_cache_type =@@global.query_cache_type; set @my_rpl_recovery_rank =@@global.rpl_recovery_rank; set @my_server_id =@@global.server_id; +set @my_slave_net_timeout =@@global.slave_net_timeout; set @my_slow_launch_time =@@global.slow_launch_time; set @my_storage_engine =@@global.storage_engine; set @my_thread_cache_size =@@global.thread_cache_size; @@ -981,6 +982,17 @@ show variables like 'hostname'; Variable_name Value hostname # End of 5.0 tests +set global slave_net_timeout=100; +set global sql_slave_skip_counter=100; +show variables like 'slave_compressed_protocol'; +Variable_name Value +slave_compressed_protocol OFF +show variables like 'slave_load_tmpdir'; +Variable_name Value +slave_load_tmpdir SLAVE_LOAD_TMPDIR +show variables like 'slave_skip_errors'; +Variable_name Value +slave_skip_errors 3,100,137,643,1752 set global binlog_cache_size =@my_binlog_cache_size; set global connect_timeout =@my_connect_timeout; set global delayed_insert_timeout =@my_delayed_insert_timeout; @@ -1006,7 +1018,9 @@ set global query_cache_limit =@my_query_cache_limit; set global query_cache_type =@my_query_cache_type; set global rpl_recovery_rank =@my_rpl_recovery_rank; set global server_id =@my_server_id; +set global slave_net_timeout =@my_slave_net_timeout; set global slow_launch_time =@my_slow_launch_time; +set global sql_slave_skip_counter =0; set global storage_engine =@my_storage_engine; set global thread_cache_size =@my_thread_cache_size; show global variables where Variable_name='table_definition_cache' or diff --git a/mysql-test/suite/rpl/r/rpl_variables.result b/mysql-test/suite/rpl/r/rpl_variables.result deleted file mode 100644 index 605a48859a0..00000000000 --- a/mysql-test/suite/rpl/r/rpl_variables.result +++ /dev/null @@ -1,19 +0,0 @@ -stop slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -reset master; -reset slave; -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -start slave; -set @my_slave_net_timeout =@@global.slave_net_timeout; -set global slave_net_timeout=100; -set global sql_slave_skip_counter=100; -show variables like 'slave_compressed_protocol'; -Variable_name Value -slave_compressed_protocol OFF -show variables like 'slave_load_tmpdir'; -Variable_name Value -slave_load_tmpdir SLAVE_LOAD_TMPDIR -show variables like 'slave_skip_errors'; -Variable_name Value -slave_skip_errors 3,100,137,643,1752 -set global slave_net_timeout=default; diff --git a/mysql-test/suite/rpl/t/rpl_variables.test b/mysql-test/suite/rpl/t/rpl_variables.test deleted file mode 100644 index 84dc3acfe6e..00000000000 --- a/mysql-test/suite/rpl/t/rpl_variables.test +++ /dev/null @@ -1,20 +0,0 @@ -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; - -# End of 4.1 tests - -# BUG #7800: Add various-slave related variables to SHOW VARIABLES -show variables like 'slave_compressed_protocol'; ---replace_column 2 SLAVE_LOAD_TMPDIR -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'; - -# Cleanup -set global slave_net_timeout=default; diff --git a/mysql-test/suite/rpl/t/rpl_variables-master.opt b/mysql-test/t/variables-master.opt similarity index 100% rename from mysql-test/suite/rpl/t/rpl_variables-master.opt rename to mysql-test/t/variables-master.opt diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 51f8d6db1db..404a98d1827 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -31,6 +31,7 @@ set @my_query_cache_limit =@@global.query_cache_limit; set @my_query_cache_type =@@global.query_cache_type; set @my_rpl_recovery_rank =@@global.rpl_recovery_rank; set @my_server_id =@@global.server_id; +set @my_slave_net_timeout =@@global.slave_net_timeout; set @my_slow_launch_time =@@global.slow_launch_time; set @my_storage_engine =@@global.storage_engine; set @my_thread_cache_size =@@global.thread_cache_size; @@ -737,6 +738,20 @@ show variables like 'hostname'; --echo End of 5.0 tests +# +# BUG #7800: SHOW VARIABLES does not show slave-related configuration +# +set global slave_net_timeout=100; +set global sql_slave_skip_counter=100; + +show variables like 'slave_compressed_protocol'; +--replace_column 2 SLAVE_LOAD_TMPDIR +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 is printed correctly. +show variables like 'slave_skip_errors'; + +# # This is at the very after the versioned tests, since it involves doing # cleanup # @@ -768,7 +783,11 @@ set global query_cache_limit =@my_query_cache_limit; set global query_cache_type =@my_query_cache_type; set global rpl_recovery_rank =@my_rpl_recovery_rank; set global server_id =@my_server_id; +set global slave_net_timeout =@my_slave_net_timeout; set global slow_launch_time =@my_slow_launch_time; +# sql_slave_skip_counter is write-only, so we can't save previous +# value and restore it here. That's ok, because it's normally 0. +set global sql_slave_skip_counter =0; set global storage_engine =@my_storage_engine; set global thread_cache_size =@my_thread_cache_size;