Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

into  riska.(none):/home/sven/bktip/5.1-new-rpl

mysql-test/r/variables-notembedded.result

+---- Init ----
+set @my_slave_net_timeout         =@@global.slave_net_timeout;
+---- Test ----
+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
+---- Clean Up ----
+set global slave_net_timeout=default;
+set global sql_slave_skip_counter= 0;

mysql-test/r/variables.result

@@ -22,7 +22,6 @@ 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;
@@ -982,17 +981,6 @@ 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;
@@ -1018,9 +1006,7 @@ 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

mysql-test/t/variables-master.opt

---slave-skip-errors=3,100,137,643,1752

mysql-test/t/variables-notembedded-master.opt

+--loose-slave-skip-errors=3,100,137,643,1752

mysql-test/t/variables-notembedded.test

+# Tests that variables work correctly (setting and showing).  This
+# test is like the main.variables test, but for variables not
+# available in embedded mode.
+
+source include/not_embedded.inc;
+
+--echo ---- Init ----
+# Backup global variables so they can be restored at end of test.
+set @my_slave_net_timeout         =@@global.slave_net_timeout;
+
+--echo ---- Test ----
+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';
+
+--echo ---- Clean Up ----
+
+set global slave_net_timeout=default;
+# 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;

mysql-test/t/variables.test

@@ -31,7 +31,6 @@ 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;
@@ -738,20 +737,6 @@ 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
 #
@@ -783,11 +768,7 @@ 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;