List:Commits« Previous MessageNext Message »
From:Sneha Modi Date:November 21 2011 5:33am
Subject:bzr push into mysql-trunk branch (sneha.modi:3634 to 3635) Bug#11748572
View as plain text  
 3635 Sneha Modi	2011-11-21 [merge]
      Bug#11748572:
      
      Merging from mysql-5.5 -> mysql-trunk

    modified:
      mysql-test/collections/default.experimental
      mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
      mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
      mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
      mysql-test/suite/sys_vars/t/disabled.def
 3634 Sunny Bains	2011-11-21
      trx can be NULL, check for that in the debug assertion.

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-11-18 12:28:10 +0000
+++ b/mysql-test/collections/default.experimental	2011-11-21 05:31:50 +0000
@@ -36,6 +36,8 @@ sys_vars.max_sp_recursion_depth_func @so
 sys_vars.ndb_log_update_as_write_basic
 sys_vars.have_ndbcluster_basic
 sys_vars.ndb_log_updated_only_basic
+sys_vars.query_cache_size_basic_64       # Bug#11748572 - 36747: ALLOCATING A LARGE QUERY CACHE IS NOT DETERMINISTIC
+sys_vars.query_cache_size_basic_32       # Bug#11748572 - 36747: ALLOCATING A LARGE QUERY CACHE IS NOT DETERMINISTIC
 sys_vars.rpl_init_slave_func		 # Bug#12535301 2011-05-09 andrei sys_vars.rpl_init_slave_func mismatches in daily-5.5
 
 rpl.rpl_mixed_mts_rec_crash_safe @solaris          # Bug#12902514 2011-08-19 andrei mts recovery tests are slow

=== modified file 'mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc'
--- a/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc	2011-11-21 05:29:28 +0000
@@ -80,8 +80,13 @@ SELECT @@global.query_cache_size;
 
 SET @@global.query_cache_size = -1;
 SELECT @@global.query_cache_size;
-SET @@global.query_cache_size = 4294967296;
-SELECT @@global.query_cache_size;
+
+#
+# Bug 11748572 - 36747: ALLOCATING A LARGE QUERY CACHE IS NOT DETERMINISTIC
+#
+# SET @@global.query_cache_size = 4294967296;
+# SELECT @@global.query_cache_size;
+
 SET @@global.query_cache_size = 511;
 SELECT @@global.query_cache_size;
 --Error ER_WRONG_TYPE_FOR_VAR

=== modified file 'mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result'
--- a/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result	2009-03-20 17:11:22 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result	2011-11-21 05:29:28 +0000
@@ -1,6 +1,8 @@
 SET @start_value = @@global.query_cache_size;
 '#--------------------FN_DYNVARS_133_01------------------------#'
 SET @@global.query_cache_size = 99;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '99'
 SET @@global.query_cache_size = DEFAULT;
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
@@ -16,10 +18,14 @@ SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
 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
 SET @@global.query_cache_size = 512;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '512'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -29,13 +35,13 @@ Warning	1282	Query cache failed to set s
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-: 'Bug#34880: Warnings are coming on assinging valid values to variable
-'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
 SET @@global.query_cache_size = 1048576;
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 1048576
 SET @@global.query_cache_size = 1048575;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1048575'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 1047552
@@ -46,14 +52,9 @@ Warning	1292	Truncated incorrect query_c
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-SET @@global.query_cache_size = 4294967296;
-Warnings:
-Warning	1292	Truncated incorrect query_cache_size value: '4294967296'
-Warning	1282	Query cache failed to set size 4294966272; new query cache size is 0
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-0
 SET @@global.query_cache_size = 511;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '511'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -75,7 +76,6 @@ Warning	1282	Query cache failed to set s
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
 SET @@global.query_cache_size = ON;
 ERROR 42000: Incorrect argument type to variable 'query_cache_size'
 SELECT @@global.query_cache_size;
@@ -105,6 +105,8 @@ WHERE VARIABLE_NAME='query_cache_size';
 1
 '#---------------------FN_DYNVARS_133_07----------------------#'
 SET @@global.query_cache_size = TRUE;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -114,6 +116,8 @@ SELECT @@global.query_cache_size;
 0
 '#---------------------FN_DYNVARS_133_08----------------------#'
 SET @@global.query_cache_size = 1;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1'
 SELECT @@query_cache_size = @@global.query_cache_size;
 @@query_cache_size = @@global.query_cache_size
 1

=== 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	2009-04-03 09:37:48 +0000
+++ b/mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result	2011-11-21 05:29:28 +0000
@@ -1,6 +1,8 @@
 SET @start_value = @@global.query_cache_size;
 '#--------------------FN_DYNVARS_133_01------------------------#'
 SET @@global.query_cache_size = 99;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '99'
 SET @@global.query_cache_size = DEFAULT;
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
@@ -16,10 +18,14 @@ SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
 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
 SET @@global.query_cache_size = 512;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '512'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -29,13 +35,13 @@ Warning	1282	Query cache failed to set s
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-: 'Bug#34880: Warnings are coming on assinging valid values to variable
-'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
 SET @@global.query_cache_size = 1048576;
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 1048576
 SET @@global.query_cache_size = 1048575;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1048575'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 1047552
@@ -46,11 +52,9 @@ Warning	1292	Truncated incorrect query_c
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-SET @@global.query_cache_size = 4294967296;
-SELECT @@global.query_cache_size;
-@@global.query_cache_size
-4294967296
 SET @@global.query_cache_size = 511;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '511'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -67,11 +71,11 @@ SELECT @@global.query_cache_size;
 0
 SET @@global.query_cache_size = 42949672950;
 Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '42949672950'
 Warning	1282	Query cache failed to set size 42949671936; new query cache size is 0
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
 SET @@global.query_cache_size = ON;
 ERROR 42000: Incorrect argument type to variable 'query_cache_size'
 SELECT @@global.query_cache_size;
@@ -101,6 +105,8 @@ WHERE VARIABLE_NAME='query_cache_size';
 1
 '#---------------------FN_DYNVARS_133_07----------------------#'
 SET @@global.query_cache_size = TRUE;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1'
 SELECT @@global.query_cache_size;
 @@global.query_cache_size
 0
@@ -110,6 +116,8 @@ SELECT @@global.query_cache_size;
 0
 '#---------------------FN_DYNVARS_133_08----------------------#'
 SET @@global.query_cache_size = 1;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1'
 SELECT @@query_cache_size = @@global.query_cache_size;
 @@query_cache_size = @@global.query_cache_size
 1

=== modified file 'mysql-test/suite/sys_vars/t/disabled.def'
--- a/mysql-test/suite/sys_vars/t/disabled.def	2011-08-22 06:14:59 +0000
+++ b/mysql-test/suite/sys_vars/t/disabled.def	2011-11-21 05:31:50 +0000
@@ -9,8 +9,6 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-query_cache_size_basic_32           : Bug#11748572: Allocating a large query cache is not deterministic
-query_cache_size_basic_64           : Bug#11748572: Allocating a large query cache is not deterministic
 transaction_prealloc_size_basic_32  : Bug#11748572
 transaction_prealloc_size_basic_64  : Bug#11748572
 #thread_cache_size_func             : Bug#11750172: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (sneha.modi:3634 to 3635) Bug#11748572Sneha Modi21 Nov