#At file:///home/ngb/mysql/bzr/bugteam-5.1-bug42640/
2854 Guangbao Ni 2009-04-03 [merge]
AutoMerged from pushbuild mysql-5.1-bugteam
modified:
mysql-test/r/mysqlbinlog_row_big.result
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/multi_range_count_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_cache_size_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/transaction_alloc_block_size_basic_64.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/t/mysqlbinlog_row_big.test
scripts/mysqld_multi.sh
=== modified file 'mysql-test/r/mysqlbinlog_row_big.result'
--- a/mysql-test/r/mysqlbinlog_row_big.result 2008-12-13 19:42:12 +0000
+++ b/mysql-test/r/mysqlbinlog_row_big.result 2009-04-02 22:34:18 +0000
@@ -9,7 +9,17 @@ SET timestamp=1000000000;
#
# We need big packets.
#
+# Capture initial value to reset at the end of the test
+# Now adjust max_allowed_packet
SET @@global.max_allowed_packet= 1024*1024*1024;
+max_allowed_packet is a global variable.
+In order for the preceding change in max_allowed_packets' value
+to be seen and used, we must start a new connection.
+The change does not take effect with the current one.
+For simplicity, we just disconnect / reconnect connection default here.
+Disconnecting default connection...
+Reconnecting default connection...
+default connection established, continuing with the test
#
# Delete all existing binary logs.
#
@@ -21,40 +31,56 @@ CREATE TABLE t1 (
c1 LONGTEXT
) ENGINE=MyISAM DEFAULT CHARSET latin1;
#
-# Show how much rows are affected by each statement.
+# Show how many rows are affected by each statement.
#
#
-# Insert a big row.
+# Insert some big rows.
#
+256MB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 16777216));
+affected rows: 1
+32MB
INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 2097152));
affected rows: 1
+4MB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 262144));
+affected rows: 1
+512KB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 32768));
+affected rows: 1
#
# Show what we have in the table.
# Do not display the column value itself, just its length.
#
SELECT LENGTH(c1) FROM t1;
+LENGTH(c1) 268435456
LENGTH(c1) 33554432
-affected rows: 1
+LENGTH(c1) 4194304
+LENGTH(c1) 524288
+affected rows: 4
#
-# Grow the row by updating.
+# Grow the rows by updating.
#
UPDATE t1 SET c1 = CONCAT(c1, c1);
-affected rows: 1
-info: Rows matched: 1 Changed: 1 Warnings: 0
+affected rows: 4
+info: Rows matched: 4 Changed: 4 Warnings: 0
#
# Show what we have in the table.
# Do not display the column value itself, just its length.
#
SELECT LENGTH(c1) FROM t1;
+LENGTH(c1) 536870912
+LENGTH(c1) 1048576
LENGTH(c1) 67108864
-affected rows: 1
+LENGTH(c1) 8388608
+affected rows: 4
#
-# Delete the row.
+# Delete the rows.
#
DELETE FROM t1 WHERE c1 >= 'ManyMegaByteBlck';
-affected rows: 1
+affected rows: 4
#
-# Hide how much rows are affected by each statement.
+# Hide how many rows are affected by each statement.
#
#
# Flush all log buffers to the log file.
@@ -70,5 +96,7 @@ FLUSH LOGS;
#
# Cleanup.
#
+# reset variable value to pass testcase checks
+SET @@global.max_allowed_packet = 1048576;
DROP TABLE t1;
remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_big_1.out
=== 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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result 2009-04-03 09:37:48 +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 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result 2009-04-03 09:37:48 +0000
@@ -71,7 +71,7 @@ SELECT @@global.join_buffer_size=8200 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=8200 OR @@global.join_buffer_size= 8228;
@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
1
@@ -103,7 +103,7 @@ SELECT @@session.join_buffer_size=8200 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=8200 OR @@session.join_buffer_size= 8228;
@@session.join_buffer_size=8200 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-26 15:34:41 +0000
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic_64.result 2009-04-03 09:37:48 +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 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_64.result 2009-04-03 09:37:48 +0000
@@ -1,7 +1,7 @@
SET @start_value = @@global.max_binlog_cache_size;
SELECT @start_value;
@start_value
-18446744073709551615
+18446744073709547520
'#--------------------FN_DYNVARS_072_01------------------------#'
SET @@global.max_binlog_cache_size = 5000;
SET @@global.max_binlog_cache_size = DEFAULT;
@@ -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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/max_heap_table_size_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/max_seeks_for_key_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/max_tmp_tables_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/max_write_lock_count_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic_64.result 2009-04-03 09:37:48 +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/multi_range_count_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/multi_range_count_basic_64.result 2009-04-03 09:37:48 +0000
@@ -81,7 +81,7 @@ SELECT @@global.multi_range_count;
4294967296
SET @@global.multi_range_count = -1024;
Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
+Warning 1292 Truncated incorrect multi_range_count value: '-1024'
SELECT @@global.multi_range_count;
@@global.multi_range_count
1
@@ -111,7 +111,7 @@ SELECT @@session.multi_range_count;
4294967296
SET @@session.multi_range_count = -1;
Warnings:
-Warning 1292 Truncated incorrect multi_range_count value: '0'
+Warning 1292 Truncated incorrect multi_range_count value: '-1'
SELECT @@session.multi_range_count;
@@session.multi_range_count
1
=== 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 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_64.result 2009-04-03 09:37:48 +0000
@@ -1,7 +1,7 @@
SET @start_global_value = @@global.myisam_max_sort_file_size;
SELECT @start_global_value;
@start_global_value
-9223372036854775807
+9223372036853727232
'#--------------------FN_DYNVARS_094_01-------------------------#'
SET @@global.myisam_max_sort_file_size = 500000;
SET @@global.myisam_max_sort_file_size = DEFAULT;
@@ -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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_repair_threads_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/net_retry_count_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result 2009-04-03 09:37:48 +0000
@@ -78,7 +78,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 +110,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
=== 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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_limit_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_min_res_unit_basic_64.result 2009-04-03 09:37:48 +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_cache_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result 2008-12-19 15:03:32 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result 2009-04-03 09:37:48 +0000
@@ -41,6 +41,8 @@ SELECT @@global.query_cache_size;
1047552
'#--------------------FN_DYNVARS_133_04-------------------------#'
SET @@global.query_cache_size = -1;
+Warnings:
+Warning 1292 Truncated incorrect query_cache_size value: '-1'
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
@@ -58,6 +60,8 @@ SELECT @@global.query_cache_size;
@@global.query_cache_size
0
SET @@global.query_cache_size = -1024;
+Warnings:
+Warning 1292 Truncated incorrect query_cache_size value: '-1024'
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
=== 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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic_64.result 2009-04-03 09:37:48 +0000
@@ -36,6 +36,8 @@ 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
@@ -53,6 +55,8 @@ SELECT @@global.sync_binlog;
@@global.sync_binlog
10240022115
SET @@global.sync_binlog = -1024;
+Warnings:
+Warning 1292 Truncated incorrect sync_binlog value: '-1024'
SELECT @@global.sync_binlog;
@@global.sync_binlog
0
=== modified file 'mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result'
--- a/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result 2008-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result 2009-04-03 09:37:48 +0000
@@ -67,7 +67,7 @@ SELECT @@global.transaction_alloc_block_
1024
SET @@global.transaction_alloc_block_size = -1024;
Warnings:
-Warning 1292 Truncated incorrect transaction_alloc_block_size value: '0'
+Warning 1292 Truncated incorrect transaction_alloc_block_size value: '-1024'
SELECT @@global.transaction_alloc_block_size;
@@global.transaction_alloc_block_size
1024
=== 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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result 2009-04-03 09:37:48 +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-07-23 14:06:44 +0000
+++ b/mysql-test/suite/sys_vars/r/wait_timeout_basic_64.result 2009-04-03 09:37:48 +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/t/mysqlbinlog_row_big.test'
--- a/mysql-test/t/mysqlbinlog_row_big.test 2008-12-13 19:42:12 +0000
+++ b/mysql-test/t/mysqlbinlog_row_big.test 2009-04-02 22:34:18 +0000
@@ -38,8 +38,26 @@ SET timestamp=1000000000;
--echo #
--echo # We need big packets.
--echo #
+--echo # Capture initial value to reset at the end of the test
+# use let $<var> = query_get_value as FLUSH statements
+# in the test will set @<var> values to NULL
+let $orig_max_allowed_packet =
+query_get_value(SELECT @@global.max_allowed_packet, @@global.max_allowed_packet, 1);
+
+--echo # Now adjust max_allowed_packet
SET @@global.max_allowed_packet= 1024*1024*1024;
+--echo max_allowed_packet is a global variable.
+--echo In order for the preceding change in max_allowed_packets' value
+--echo to be seen and used, we must start a new connection.
+--echo The change does not take effect with the current one.
+--echo For simplicity, we just disconnect / reconnect connection default here.
+--echo Disconnecting default connection...
+disconnect default;
+--echo Reconnecting default connection...
+connect (default, localhost,root,,);
+--echo default connection established, continuing with the test
+
--echo #
--echo # Delete all existing binary logs.
--echo #
@@ -53,34 +71,35 @@ eval CREATE TABLE t1 (
) ENGINE=$engine_type DEFAULT CHARSET latin1;
--echo #
---echo # Show how much rows are affected by each statement.
+--echo # Show how many rows are affected by each statement.
--echo #
--enable_info
--echo #
---echo # Insert a big row.
+--echo # Insert some big rows.
--echo #
-#
-# 256MB
-#INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 16777216));
-#
-# 32MB
+
+--echo 256MB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 16777216));
+
+--echo 32MB
INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 2097152));
-#
-# 4MB
-#INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 262144));
-#
-# 512KB
-#INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 32768));
+
+--echo 4MB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 262144));
+
+--echo 512KB
+INSERT INTO t1 VALUES (REPEAT('ManyMegaByteBlck', 32768));
--echo #
--echo # Show what we have in the table.
--echo # Do not display the column value itself, just its length.
--echo #
+--sorted_result
query_vertical SELECT LENGTH(c1) FROM t1;
--echo #
---echo # Grow the row by updating.
+--echo # Grow the rows by updating.
--echo #
UPDATE t1 SET c1 = CONCAT(c1, c1);
@@ -88,15 +107,16 @@ UPDATE t1 SET c1 = CONCAT(c1, c1);
--echo # Show what we have in the table.
--echo # Do not display the column value itself, just its length.
--echo #
+--sorted_result
query_vertical SELECT LENGTH(c1) FROM t1;
--echo #
---echo # Delete the row.
+--echo # Delete the rows.
--echo #
DELETE FROM t1 WHERE c1 >= 'ManyMegaByteBlck';
--echo #
---echo # Hide how much rows are affected by each statement.
+--echo # Hide how many rows are affected by each statement.
--echo #
--disable_info
@@ -113,13 +133,15 @@ FLUSH LOGS;
--echo # at the bottom of the test script.
--echo #
let $MYSQLD_DATADIR= `select @@datadir`;
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR>
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/
--exec $MYSQL_BINLOG -v -v $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/$mysqlbinlog_output
--echo #
--echo # Cleanup.
--echo #
+--echo # reset variable value to pass testcase checks
+eval SET @@global.max_allowed_packet = $orig_max_allowed_packet;
DROP TABLE t1;
--echo remove_file \$MYSQLTEST_VARDIR/$mysqlbinlog_output
=== modified file 'scripts/mysqld_multi.sh'
--- a/scripts/mysqld_multi.sh 2009-02-04 19:26:04 +0000
+++ b/scripts/mysqld_multi.sh 2009-04-02 19:42:29 +0000
@@ -293,12 +293,7 @@ sub start_mysqlds()
@groups = &find_groups($groupids);
for ($i = 0; defined($groups[$i]); $i++)
{
- # Defaults are made explicit parameters to server execution...
@options = defaults_for_group($groups[$i]);
- # ...so server MUST NOT try to read again from some config file, especially
- # as the "right" file may be unknown to the server if we are using
- # --defaults-file=... params in here.
- unshift(@options,"--no-defaults");
$mysqld_found= 1; # The default
$mysqld_found= 0 if (!length($mysqld));
| Thread |
|---|
| • bzr commit into mysql-5.1-bugteam branch (gni:2854) | Guangbao Ni | 3 Apr |
