Bug#19263: variables.test doesn't clean up after itself

save global server variables before fiddling with them and restore them later


BitKeeper/deleted/.del-variables-master.opt~8a6cb6459b54545:
  Delete: mysql-test/t/variables-master.opt
mysql-test/r/variables.result:
  save and restore globals
mysql-test/t/variables.test:
  save and restore globals

1 files changed, 54 insertions, 0 deletions

diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 32cd8790874..70282c5143e 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -1,4 +1,31 @@
 drop table if exists t1,t2;
+set @my_binlog_cache_size         =@@global.binlog_cache_size;
+set @my_connect_timeout           =@@global.connect_timeout;
+set @my_delayed_insert_timeout    =@@global.delayed_insert_timeout;
+set @my_delayed_queue_size        =@@global.delayed_queue_size;
+set @my_flush                     =@@global.flush;
+set @my_flush_time                =@@global.flush_time;
+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_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;
+set @my_net_read_timeout          =@@global.net_read_timeout;
+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_slow_launch_time          =@@global.slow_launch_time;
+set @my_storage_engine            =@@global.storage_engine;
+set @my_thread_cache_size         =@@global.thread_cache_size;
 set @`test`=1;
 select @test, @`test`, @TEST, @`TEST`, @"teSt";
 @test	@`test`	@TEST	@`TEST`	@"teSt"
@@ -612,4 +639,31 @@ select @@version, @@version_comment, @@version_compile_machine,
 @@version_compile_os;
 @@version	@@version_comment	@@version_compile_machine	@@version_compile_os
 #	#	#	#
+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;
+set global delayed_queue_size        =@my_delayed_queue_size;
+set global flush                     =@my_flush;
+set global flush_time                =@my_flush_time;
+set global key_buffer_size           =@my_key_buffer_size;
+set global max_binlog_cache_size     =default;
+set global max_binlog_size           =@my_max_binlog_size;
+set global max_connect_errors        =@my_max_connect_errors;
+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 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;
+set global net_read_timeout          =@my_net_read_timeout;
+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 slow_launch_time          =@my_slow_launch_time;
+set global storage_engine            =@my_storage_engine;
+set global thread_cache_size         =@my_thread_cache_size;
 End of 5.0 tests