#At file:///home/ngb/mysql/bzr/bugteam-6.0-bug42640/
3176 Guangbao Ni 2009-04-03 [merge]
Automerged from pushbuild mysql-6.0-bugteam
modified:
mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result
mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result
mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/log_warnings_basic_64.result
mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result
mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result
mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result
mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result
mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result
mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result
mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result
mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result
mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result
mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result
mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result
mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result
mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result
mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result
mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result
mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result
mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result
mysql-test/suite/sys_vars/t/disabled.def
mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
=== modified file 'mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -44,7 +44,7 @@ SET @@global.binlog_cache_size = 10000.0
ERROR 42000: Incorrect argument type to variable 'binlog_cache_size'
SET @@global.binlog_cache_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect binlog_cache_size value: '0'
+Warning 1292 Truncated incorrect binlog_cache_size value: '-1024'
SELECT @@global.binlog_cache_size;
@@global.binlog_cache_size
4096
=== modified file 'mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -66,6 +66,8 @@ SELECT @@global.bulk_insert_buffer_size;
@@global.bulk_insert_buffer_size
42949672950
SET @@global.bulk_insert_buffer_size = -1024;
+Warnings:
+Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '-1024'
SELECT @@global.bulk_insert_buffer_size;
@@global.bulk_insert_buffer_size
0
@@ -80,6 +82,8 @@ SELECT @@session.bulk_insert_buffer_size
@@session.bulk_insert_buffer_size
42949672950
SET @@session.bulk_insert_buffer_size = -2;
+Warnings:
+Warning 1292 Truncated incorrect bulk_insert_buffer_size value: '-2'
SELECT @@session.bulk_insert_buffer_size;
@@session.bulk_insert_buffer_size
0
=== modified file 'mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result 2009-04-03 09:30:07 +0000
@@ -35,7 +35,7 @@ SELECT @@global.delayed_insert_limit;
1
SET @@global.delayed_insert_limit = -1024;
Warnings:
-Warning 1292 Truncated incorrect delayed_insert_limit value: '0'
+Warning 1292 Truncated incorrect delayed_insert_limit value: '-1024'
SELECT @@global.delayed_insert_limit;
@@global.delayed_insert_limit
1
=== modified file 'mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -35,7 +35,7 @@ SELECT @@global.delayed_queue_size;
1
SET @@global.delayed_queue_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect delayed_queue_size value: '0'
+Warning 1292 Truncated incorrect delayed_queue_size value: '-1024'
SELECT @@global.delayed_queue_size;
@@global.delayed_queue_size
1
=== modified file 'mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result 2009-01-30 10:46:17 +0000
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -66,7 +66,7 @@ SELECT @@global.join_buffer_size=164 OR
1
SET @@global.join_buffer_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '0'
+Warning 1292 Truncated incorrect join_buffer_size value: '-1024'
SELECT @@global.join_buffer_size;
@@global.join_buffer_size
164
@@ -99,7 +99,7 @@ SELECT @@session.join_buffer_size=164 O
1
SET @@session.join_buffer_size = -2;
Warnings:
-Warning 1292 Truncated incorrect join_buffer_size value: '0'
+Warning 1292 Truncated incorrect join_buffer_size value: '-2'
SELECT @@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228;
@@session.join_buffer_size=164 OR @@session.join_buffer_size= 8228
1
=== modified file 'mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result 2009-01-30 14:13:39 +0000
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -17,8 +17,6 @@ SELECT @@global.key_buffer_size BETWEEN
@@global.key_buffer_size BETWEEN 8 AND 36
1
SET @@global.key_buffer_size = 1800;
-Warnings:
-Warning 1292 Truncated incorrect key_buffer_size value: '1800'
SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
@@global.key_buffer_size BETWEEN 8 AND 36
1
=== modified file 'mysql-test/suite/sys_vars/r/log_warnings_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result 2009-04-03 09:30:07 +0000
@@ -74,6 +74,8 @@ SELECT @@global.log_warnings;
@@global.log_warnings
100000000000
SET @@global.log_warnings = -1024;
+Warnings:
+Warning 1292 Truncated incorrect log_warnings value: '-1024'
SELECT @@global.log_warnings;
@@global.log_warnings
0
@@ -92,6 +94,8 @@ SELECT @@session.log_warnings;
@@session.log_warnings
100000000000
SET @@session.log_warnings = -2;
+Warnings:
+Warning 1292 Truncated incorrect log_warnings value: '-2'
SELECT @@session.log_warnings;
@@session.log_warnings
0
=== modified file 'mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result 2009-01-30 10:46:17 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -39,7 +39,7 @@ SELECT @@global.max_binlog_cache_size;
'#--------------------FN_DYNVARS_072_04-------------------------#'
SET @@global.max_binlog_cache_size = -1;
Warnings:
-Warning 1292 Truncated incorrect max_binlog_cache_size value: '0'
+Warning 1292 Truncated incorrect max_binlog_cache_size value: '-1'
SELECT @@global.max_binlog_cache_size;
@@global.max_binlog_cache_size
4096
@@ -54,7 +54,7 @@ SELECT @@global.max_binlog_cache_size;
99999997952
SET @@global.max_binlog_cache_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect max_binlog_cache_size value: '0'
+Warning 1292 Truncated incorrect max_binlog_cache_size value: '-1024'
SELECT @@global.max_binlog_cache_size;
@@global.max_binlog_cache_size
4096
=== modified file 'mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result 2009-04-03 09:30:07 +0000
@@ -39,7 +39,7 @@ SELECT @@global.max_connect_errors;
'#--------------------FN_DYNVARS_073_04-------------------------#'
SET @@global.max_connect_errors = -1;
Warnings:
-Warning 1292 Truncated incorrect max_connect_errors value: '0'
+Warning 1292 Truncated incorrect max_connect_errors value: '-1'
SELECT @@global.max_connect_errors;
@@global.max_connect_errors
1
@@ -54,7 +54,7 @@ SELECT @@global.max_connect_errors;
100000000000
SET @@global.max_connect_errors = -1024;
Warnings:
-Warning 1292 Truncated incorrect max_connect_errors value: '0'
+Warning 1292 Truncated incorrect max_connect_errors value: '-1024'
SELECT @@global.max_connect_errors;
@@global.max_connect_errors
1
=== modified file 'mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -73,13 +73,13 @@ SELECT @@session.max_heap_table_size;
'#------------------FN_DYNVARS_077_05-----------------------#'
SET @@global.max_heap_table_size = -1;
Warnings:
-Warning 1292 Truncated incorrect max_heap_table_size value: '0'
+Warning 1292 Truncated incorrect max_heap_table_size value: '-1'
SELECT @@global.max_heap_table_size;
@@global.max_heap_table_size
16384
SET @@global.max_heap_table_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect max_heap_table_size value: '0'
+Warning 1292 Truncated incorrect max_heap_table_size value: '-1024'
SELECT @@global.max_heap_table_size;
@@global.max_heap_table_size
16384
@@ -111,7 +111,7 @@ SELECT @@global.max_heap_table_size;
4294967296
SET @@session.max_heap_table_size = -1;
Warnings:
-Warning 1292 Truncated incorrect max_heap_table_size value: '0'
+Warning 1292 Truncated incorrect max_heap_table_size value: '-1'
SELECT @@session.max_heap_table_size;
@@session.max_heap_table_size
16384
=== modified file 'mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result 2009-04-03 09:30:07 +0000
@@ -77,7 +77,7 @@ SELECT @@global.max_seeks_for_key;
1
SET @@global.max_seeks_for_key = -1024;
Warnings:
-Warning 1292 Truncated incorrect max_seeks_for_key value: '0'
+Warning 1292 Truncated incorrect max_seeks_for_key value: '-1024'
SELECT @@global.max_seeks_for_key;
@@global.max_seeks_for_key
1
@@ -103,7 +103,7 @@ SELECT @@session.max_seeks_for_key;
1
SET @@session.max_seeks_for_key = -2;
Warnings:
-Warning 1292 Truncated incorrect max_seeks_for_key value: '0'
+Warning 1292 Truncated incorrect max_seeks_for_key value: '-2'
SELECT @@session.max_seeks_for_key;
@@session.max_seeks_for_key
1
=== modified file 'mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result 2009-04-03 09:30:07 +0000
@@ -71,7 +71,7 @@ SELECT @@session.max_tmp_tables;
'#------------------FN_DYNVARS_086_05-----------------------#'
SET @@global.max_tmp_tables = -1024;
Warnings:
-Warning 1292 Truncated incorrect max_tmp_tables value: '0'
+Warning 1292 Truncated incorrect max_tmp_tables value: '-1024'
SELECT @@global.max_tmp_tables;
@@global.max_tmp_tables
1
@@ -81,7 +81,7 @@ SELECT @@global.max_tmp_tables;
4294967296
SET @@global.max_tmp_tables = -1;
Warnings:
-Warning 1292 Truncated incorrect max_tmp_tables value: '0'
+Warning 1292 Truncated incorrect max_tmp_tables value: '-1'
SELECT @@global.max_tmp_tables;
@@global.max_tmp_tables
1
@@ -105,7 +105,7 @@ SELECT @@session.max_tmp_tables;
4294967296
SET @@session.max_tmp_tables = -1;
Warnings:
-Warning 1292 Truncated incorrect max_tmp_tables value: '0'
+Warning 1292 Truncated incorrect max_tmp_tables value: '-1'
SELECT @@session.max_tmp_tables;
@@session.max_tmp_tables
1
@@ -115,7 +115,7 @@ SELECT @@session.max_tmp_tables;
429496729500
SET @@session.max_tmp_tables = -001;
Warnings:
-Warning 1292 Truncated incorrect max_tmp_tables value: '0'
+Warning 1292 Truncated incorrect max_tmp_tables value: '-1'
SELECT @@session.max_tmp_tables;
@@session.max_tmp_tables
1
=== modified file 'mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result 2009-04-03 09:30:07 +0000
@@ -37,7 +37,7 @@ SELECT @@global.max_write_lock_count;
'#------------------FN_DYNVARS_088_04-----------------------#'
SET @@global.max_write_lock_count = -1024;
Warnings:
-Warning 1292 Truncated incorrect max_write_lock_count value: '0'
+Warning 1292 Truncated incorrect max_write_lock_count value: '-1024'
SELECT @@global.max_write_lock_count;
@@global.max_write_lock_count
1
@@ -47,7 +47,7 @@ SELECT @@global.max_write_lock_count;
4294967296
SET @@global.max_write_lock_count = -1;
Warnings:
-Warning 1292 Truncated incorrect max_write_lock_count value: '0'
+Warning 1292 Truncated incorrect max_write_lock_count value: '-1'
SELECT @@global.max_write_lock_count;
@@global.max_write_lock_count
1
=== modified file 'mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result 2009-04-03 09:30:07 +0000
@@ -82,6 +82,8 @@ SELECT @@global.min_examined_row_limit;
@@global.min_examined_row_limit
429496726
SET @@global.min_examined_row_limit = -1024;
+Warnings:
+Warning 1292 Truncated incorrect min_examined_row_limit value: '-1024'
SELECT @@global.min_examined_row_limit;
@@global.min_examined_row_limit
0
@@ -104,6 +106,8 @@ SELECT @@session.min_examined_row_limit;
@@session.min_examined_row_limit
4294967296
SET @@session.min_examined_row_limit = -1;
+Warnings:
+Warning 1292 Truncated incorrect min_examined_row_limit value: '-1'
SELECT @@session.min_examined_row_limit;
@@session.min_examined_row_limit
0
=== modified file 'mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result 2009-01-30 10:46:17 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -48,14 +48,20 @@ SET @@local.myisam_max_sort_file_size =
ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
'#------------------FN_DYNVARS_094_05-----------------------#'
SET @@global.myisam_max_sort_file_size = -1;
+Warnings:
+Warning 1292 Truncated incorrect myisam_max_sort_file_size value: '-1'
SELECT @@global.myisam_max_sort_file_size;
@@global.myisam_max_sort_file_size
0
SET @@global.myisam_max_sort_file_size = -2147483648;
+Warnings:
+Warning 1292 Truncated incorrect myisam_max_sort_file_size value: '-2147483648'
SELECT @@global.myisam_max_sort_file_size;
@@global.myisam_max_sort_file_size
0
SET @@global.myisam_max_sort_file_size = -2147483649;
+Warnings:
+Warning 1292 Truncated incorrect myisam_max_sort_file_size value: '-2147483649'
SELECT @@global.myisam_max_sort_file_size;
@@global.myisam_max_sort_file_size
0
=== modified file 'mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result 2009-04-03 09:30:07 +0000
@@ -61,7 +61,7 @@ SELECT @@global.myisam_repair_threads ;
1
SET @@global.myisam_repair_threads = -1024;
Warnings:
-Warning 1292 Truncated incorrect myisam_repair_threads value: '0'
+Warning 1292 Truncated incorrect myisam_repair_threads value: '-1024'
SELECT @@global.myisam_repair_threads ;
@@global.myisam_repair_threads
1
@@ -102,7 +102,7 @@ SELECT @@session.myisam_repair_threads ;
1
SET @@session.myisam_repair_threads = -2;
Warnings:
-Warning 1292 Truncated incorrect myisam_repair_threads value: '0'
+Warning 1292 Truncated incorrect myisam_repair_threads value: '-2'
SELECT @@session.myisam_repair_threads ;
@@session.myisam_repair_threads
1
=== modified file 'mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -61,7 +61,7 @@ SELECT @@global.myisam_sort_buffer_size
4
SET @@global.myisam_sort_buffer_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect myisam_sort_buffer_size value: '0'
+Warning 1292 Truncated incorrect myisam_sort_buffer_size value: '-1024'
SELECT @@global.myisam_sort_buffer_size ;
@@global.myisam_sort_buffer_size
4
@@ -102,7 +102,7 @@ SELECT @@session.myisam_sort_buffer_size
4
SET @@session.myisam_sort_buffer_size = -2;
Warnings:
-Warning 1292 Truncated incorrect myisam_sort_buffer_size value: '0'
+Warning 1292 Truncated incorrect myisam_sort_buffer_size value: '-2'
SELECT @@session.myisam_sort_buffer_size ;
@@session.myisam_sort_buffer_size
4
=== modified file 'mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result 2009-04-03 09:30:07 +0000
@@ -77,7 +77,7 @@ SELECT @@global.net_retry_count;
1
SET @@global.net_retry_count = -1024;
Warnings:
-Warning 1292 Truncated incorrect net_retry_count value: '0'
+Warning 1292 Truncated incorrect net_retry_count value: '-1024'
SELECT @@global.net_retry_count;
@@global.net_retry_count
1
@@ -107,7 +107,7 @@ SELECT @@session.net_retry_count;
1
SET @@session.net_retry_count = -2;
Warnings:
-Warning 1292 Truncated incorrect net_retry_count value: '0'
+Warning 1292 Truncated incorrect net_retry_count value: '-2'
SELECT @@session.net_retry_count;
@@session.net_retry_count
1
=== modified file 'mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -57,14 +57,6 @@ SET @@session.query_alloc_block_size = 1
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
1024
-SET @@session.query_alloc_block_size = 4294967295;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-4294966272
-SET @@session.query_alloc_block_size = 4294967294;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-4294966272
SET @@session.query_alloc_block_size = 655536;
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
@@ -78,7 +70,7 @@ SELECT @@global.query_alloc_block_size;
1024
SET @@global.query_alloc_block_size = -1;
Warnings:
-Warning 1292 Truncated incorrect query_alloc_block_size value: '0'
+Warning 1292 Truncated incorrect query_alloc_block_size value: '-1'
SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size
1024
@@ -110,7 +102,7 @@ SELECT @@session.query_alloc_block_size;
1024
SET @@session.query_alloc_block_size = -2;
Warnings:
-Warning 1292 Truncated incorrect query_alloc_block_size value: '0'
+Warning 1292 Truncated incorrect query_alloc_block_size value: '-2'
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
1024
@@ -122,16 +114,12 @@ Warning 1292 Truncated incorrect query_a
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
1024
-SET @@session.query_alloc_block_size = 4294967296;
-SELECT @@session.query_alloc_block_size;
-@@session.query_alloc_block_size
-4294967296
'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@session.query_alloc_block_size = test;
ERROR 42000: Incorrect argument type to variable 'query_alloc_block_size'
SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size
-4294967296
+1024
'#------------------FN_DYNVARS_130_06-----------------------#'
'Bug# 34877: OutOFMemeory errors are coming if we dont assign these values to variable before comparision statement';
SET @@global.query_alloc_block_size = 1;
=== modified file 'mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result 2009-04-03 09:30:07 +0000
@@ -32,6 +32,8 @@ SELECT @@global.query_cache_limit;
1048575
'#--------------------FN_DYNVARS_131_04-------------------------#'
SET @@global.query_cache_limit = -1;
+Warnings:
+Warning 1292 Truncated incorrect query_cache_limit value: '-1'
SELECT @@global.query_cache_limit;
@@global.query_cache_limit
0
@@ -49,6 +51,8 @@ SELECT @@global.query_cache_limit;
@@global.query_cache_limit
10240022115
SET @@global.query_cache_limit = -1024;
+Warnings:
+Warning 1292 Truncated incorrect query_cache_limit value: '-1024'
SELECT @@global.query_cache_limit;
@@global.query_cache_limit
0
=== modified file 'mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result 2009-04-03 09:30:07 +0000
@@ -42,6 +42,8 @@ SELECT @@global.query_cache_min_res_unit
1048576
'#--------------------FN_DYNVARS_132_04-------------------------#'
SET @@global.query_cache_min_res_unit = -1;
+Warnings:
+Warning 1292 Truncated incorrect query_cache_min_res_unit value: '-1'
SELECT @@global.query_cache_min_res_unit;
@@global.query_cache_min_res_unit
512
@@ -59,6 +61,8 @@ SELECT @@global.query_cache_min_res_unit
@@global.query_cache_min_res_unit
512
SET @@global.query_cache_min_res_unit = -1024;
+Warnings:
+Warning 1292 Truncated incorrect query_cache_min_res_unit value: '-1024'
SELECT @@global.query_cache_min_res_unit;
@@global.query_cache_min_res_unit
512
=== modified file 'mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -35,10 +35,6 @@ SET @@global.query_prealloc_size = 819
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
8192
-SET @@global.query_prealloc_size = 4294967295;
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-4294966272
SET @@global.query_prealloc_size = 655354;
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
@@ -48,10 +44,6 @@ SET @@session.query_prealloc_size = 81
SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size
8192
-SET @@session.query_prealloc_size = 4294967295;
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
-4294966272
SET @@session.query_prealloc_size = 655345;
SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size
@@ -63,48 +55,32 @@ Warning 1292 Truncated incorrect query_p
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
8192
-SET @@global.query_prealloc_size = -1024;
-Warnings:
-Warning 1292 Truncated incorrect query_prealloc_size value: '0'
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-8192
-SET @@global.query_prealloc_size = 429496729533;
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-429496728576
SET @@global.query_prealloc_size = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-429496728576
+8192
SET @@global.query_prealloc_size = test;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-429496728576
+8192
SET @@global.query_prealloc_size = "test";
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-429496728576
+8192
SET @@global.query_prealloc_size = 'test';
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-429496728576
+8192
SET @@global.query_prealloc_size = ON;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
-429496728576
-SET @@session.query_prealloc_size = 0;
-Warnings:
-Warning 1292 Truncated incorrect query_prealloc_size value: '0'
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
8192
-SET @@session.query_prealloc_size = -2;
+SET @@session.query_prealloc_size = 0;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '0'
SELECT @@session.query_prealloc_size ;
=== modified file 'mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -71,7 +71,7 @@ SELECT @@global.range_alloc_block_size;
4096
SET @@global.range_alloc_block_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect range_alloc_block_size value: '0'
+Warning 1292 Truncated incorrect range_alloc_block_size value: '-1024'
SELECT @@global.range_alloc_block_size;
@@global.range_alloc_block_size
4096
@@ -97,7 +97,7 @@ SELECT @@session.range_alloc_block_size;
4096
SET @@session.range_alloc_block_size = -2;
Warnings:
-Warning 1292 Truncated incorrect range_alloc_block_size value: '0'
+Warning 1292 Truncated incorrect range_alloc_block_size value: '-2'
SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size
4096
=== modified file 'mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result 2009-04-03 09:30:07 +0000
@@ -45,14 +45,20 @@ SET @@local.rpl_recovery_rank = 4;
ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
'#------------------FN_DYNVARS_142_04-----------------------#'
SET @@global.rpl_recovery_rank = -1;
+Warnings:
+Warning 1292 Truncated incorrect rpl_recovery_rank value: '-1'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
SET @@global.rpl_recovery_rank = -2147483648;
+Warnings:
+Warning 1292 Truncated incorrect rpl_recovery_rank value: '-2147483648'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
SET @@global.rpl_recovery_rank = -2147483649;
+Warnings:
+Warning 1292 Truncated incorrect rpl_recovery_rank value: '-2147483649'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
0
=== modified file 'mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result 2009-04-03 09:30:07 +0000
@@ -55,6 +55,8 @@ SET @@local.slave_transaction_retries =
ERROR HY000: Variable 'slave_transaction_retries' is a GLOBAL variable and should be set with SET GLOBAL
'#------------------FN_DYNVARS_149_05-----------------------#'
SET @@global.slave_transaction_retries = -1;
+Warnings:
+Warning 1292 Truncated incorrect slave_transaction_retries value: '-1'
SELECT @@global.slave_transaction_retries;
@@global.slave_transaction_retries
0
=== modified file 'mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result 2009-04-03 09:30:07 +0000
@@ -36,47 +36,57 @@ SELECT @@global.sync_binlog;
65536
'#--------------------FN_DYNVARS_168_04-------------------------#'
SET @@global.sync_binlog = -1;
+Warnings:
+Warning 1292 Truncated incorrect sync_binlog value: '-1'
SELECT @@global.sync_binlog;
@@global.sync_binlog
0
SET @@global.sync_binlog = 4294967296;
+Warnings:
+Warning 1292 Truncated incorrect sync_binlog value: '4294967296'
SELECT @@global.sync_binlog;
@@global.sync_binlog
-4294967296
+4294967295
SET @@global.sync_binlog = 10240022115;
+Warnings:
+Warning 1292 Truncated incorrect sync_binlog value: '10240022115'
SELECT @@global.sync_binlog;
@@global.sync_binlog
-10240022115
+4294967295
SET @@global.sync_binlog = 10000.01;
ERROR 42000: Incorrect argument type to variable 'sync_binlog'
SELECT @@global.sync_binlog;
@@global.sync_binlog
-10240022115
+4294967295
SET @@global.sync_binlog = -1024;
+Warnings:
+Warning 1292 Truncated incorrect sync_binlog value: '-1024'
SELECT @@global.sync_binlog;
@@global.sync_binlog
0
SET @@global.sync_binlog = 42949672950;
+Warnings:
+Warning 1292 Truncated incorrect sync_binlog value: '42949672950'
SELECT @@global.sync_binlog;
@@global.sync_binlog
-42949672950
+4294967295
'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@global.sync_binlog = ON;
ERROR 42000: Incorrect argument type to variable 'sync_binlog'
SELECT @@global.sync_binlog;
@@global.sync_binlog
-42949672950
+4294967295
SET @@global.sync_binlog = 'test';
ERROR 42000: Incorrect argument type to variable 'sync_binlog'
SELECT @@global.sync_binlog;
@@global.sync_binlog
-42949672950
+4294967295
'#-------------------FN_DYNVARS_168_05----------------------------#'
SET @@session.sync_binlog = 0;
ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@sync_binlog;
@@sync_binlog
-42949672950
+4294967295
'#----------------------FN_DYNVARS_168_06------------------------#'
SELECT @@global.sync_binlog = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -88,7 +98,7 @@ SET sync_binlog = 1;
ERROR HY000: Variable 'sync_binlog' is a GLOBAL variable and should be set with SET GLOBAL
SELECT @@sync_binlog;
@@sync_binlog
-42949672950
+4294967295
SET local.sync_binlog = 1;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sync_binlog = 1' at line 1
SELECT local.sync_binlog;
=== modified file 'mysql-test/suite/sys_vars/r/tmp_table_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result 2009-03-24 10:41:07 +0000
+++ b/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result 2009-04-03 09:30:07 +0000
@@ -100,8 +100,6 @@ SELECT @@session.tmp_table_size;
SET @@session.tmp_table_size = "Test";
ERROR 42000: Incorrect argument type to variable 'tmp_table_size'
SET @@session.tmp_table_size = 12345678901;
-Warnings:
-Warning 1292 Truncated incorrect tmp_table_size value: '12345678901'
SELECT @@session.tmp_table_size IN (12345678901,4294967295);
@@session.tmp_table_size IN (12345678901,4294967295)
1
=== modified file 'mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result 2009-04-03 09:30:07 +0000
@@ -66,7 +66,7 @@ SELECT @@global.transaction_prealloc_siz
1024
SET @@global.transaction_prealloc_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect transaction_prealloc_size value: '0'
+Warning 1292 Truncated incorrect transaction_prealloc_size value: '-1024'
SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
1024
=== modified file 'mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result 2009-04-03 09:30:07 +0000
@@ -44,7 +44,7 @@ Warnings:
Warning 1292 Truncated incorrect wait_timeout value: '0'
SET @@global.wait_timeout = -1024;
Warnings:
-Warning 1292 Truncated incorrect wait_timeout value: '0'
+Warning 1292 Truncated incorrect wait_timeout value: '-1024'
'Bug # 34837: Errors are not coming on assigning invalid values to variable';
SET @@global.wait_timeout = ON;
ERROR 42000: Incorrect argument type to variable 'wait_timeout'
=== modified file 'mysql-test/suite/sys_vars/t/disabled.def'
--- a/mysql-test/suite/sys_vars/t/disabled.def 2009-02-13 16:18:07 +0000
+++ b/mysql-test/suite/sys_vars/t/disabled.def 2009-04-03 09:30:07 +0000
@@ -9,12 +9,9 @@
# Do not use any TAB characters for whitespace.
#
##############################################################################
-rpl_recovery_rank_basic_64 : Bug#42838: sys_vars.rpl_recovery_rank_basic_64 is disabled
-query_alloc_block_size_basic_64 : Bug#42839: sys_vars.query_alloc_block_size_basic_64 is disabled
query_cache_size_basic_32 : Bug#36747: Allocating a large query cache is not deterministic
query_cache_size_basic_64 : Bug#36747: Allocating a large query cache is not deterministic
max_heap_table_size_basic_32 : Bug#36877: main.max_heap_table_size_basic_32 fails on some systems
-#query_cache_wlock_invalidate_func : Bug#37962: 2008-12-08 Test contains sleeps/race conditions
#thread_cache_size_func : Bug#40575: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
log_output_basic : Bug#40988: log_output_basic.test succeeded though syntactically false.
=== modified file 'mysql-test/suite/sys_vars/t/tmp_table_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test 2008-12-10 09:02:11 +0000
+++ b/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test 2009-04-03 09:30:07 +0000
@@ -133,7 +133,9 @@ SELECT @@session.tmp_table_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.tmp_table_size = "Test";
+--disable_warnings
SET @@session.tmp_table_size = 12345678901;
+--enable_warnings
# With a 64 bit mysqld:12345678901,with a 32 bit mysqld: 4294967295
SELECT @@session.tmp_table_size IN (12345678901,4294967295);
| Thread |
|---|
| • bzr commit into mysql-6.0-bugteam branch (gni:3176) | Guangbao Ni | 3 Apr |
