summaryrefslogtreecommitdiff
path: root/mysql-test/t/variables.test
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-01-30 15:44:49 +0200
committerGeorgi Kodinov <joro@sun.com>2009-01-30 15:44:49 +0200
commit3aec7ca4156e8427cec829d6d392e345d15ba20d (patch)
treea6a00e2376ec5327aa29d5a5b2441a06f8d146d4 /mysql-test/t/variables.test
parent355d084567bb94a878fe586c75d0756d3fdf8204 (diff)
parent16a6158c4764d0a264c16ce7010753e16946ab42 (diff)
downloadmariadb-git-3aec7ca4156e8427cec829d6d392e345d15ba20d.tar.gz
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'mysql-test/t/variables.test')
-rw-r--r--mysql-test/t/variables.test8
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 828cb3a2916..ab0279ef1b1 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -24,6 +24,7 @@ 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_myisam_data_pointer_size =@@global.myisam_data_pointer_size;
+set @my_myisam_max_sort_file_size =@@global.myisam_max_sort_file_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;
@@ -34,7 +35,7 @@ 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 @my_max_allowed_packet =@@global.max_allowed_packet;
# case insensitivity tests (new in 5.0)
set @`test`=1;
select @test, @`test`, @TEST, @`TEST`, @"teSt";
@@ -748,7 +749,7 @@ 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; #@my_max_binlog_cache_size;
+set global max_binlog_cache_size =@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;
@@ -759,6 +760,7 @@ set global max_join_size =@my_max_join_size;
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 myisam_max_sort_file_size =@my_myisam_max_sort_file_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;
@@ -769,7 +771,7 @@ 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;
-
+set global max_allowed_packet =@my_max_allowed_packet;
#
# Bug#28580 Repeatation of status variables
#