From 881759bacb0ec4f16dd94e8a8dd95747cf3bbf78 Mon Sep 17 00:00:00 2001
From: vasil <>
Date: Tue, 6 Jan 2009 07:56:32 +0000
Subject: [PATCH] branches/zip:

Add patch to fix the failing main.variables mysql-test. It started failing
after the variable innodb_use_sys_malloc was added because it matches
'%alloc%' and the test is badly written and expects that no new variables
like that will ever be added.
---
 mysql-test/patches/bug41893.diff | 87 ++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 mysql-test/patches/bug41893.diff

diff --git a/mysql-test/patches/bug41893.diff b/mysql-test/patches/bug41893.diff
new file mode 100644
index 00000000000..f42f4ae71cb
--- /dev/null
+++ b/mysql-test/patches/bug41893.diff
@@ -0,0 +1,87 @@
+=== modified file 'mysql-test/r/variables.result'
+--- mysql-test/r/variables.result	2008-11-27 10:50:28 +0000
++++ mysql-test/r/variables.result	2009-01-06 07:33:27 +0000
+@@ -297,14 +297,14 @@
+ select ROUND(RAND(),5);
+ ROUND(RAND(),5)
+ 0.02887
+-show variables like '%alloc%';
++show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
+ Variable_name	Value
+ query_alloc_block_size	8192
+ query_prealloc_size	8192
+ range_alloc_block_size	4096
+ transaction_alloc_block_size	8192
+ transaction_prealloc_size	4096
+-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
++select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
+ VARIABLE_NAME	VARIABLE_VALUE
+ QUERY_ALLOC_BLOCK_SIZE	8192
+ QUERY_PREALLOC_SIZE	8192
+@@ -319,14 +319,14 @@
+ select @@query_alloc_block_size;
+ @@query_alloc_block_size
+ 17408
+-show variables like '%alloc%';
++show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
+ Variable_name	Value
+ query_alloc_block_size	17408
+ query_prealloc_size	18432
+ range_alloc_block_size	16384
+ transaction_alloc_block_size	19456
+ transaction_prealloc_size	20480
+-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
++select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
+ VARIABLE_NAME	VARIABLE_VALUE
+ QUERY_ALLOC_BLOCK_SIZE	17408
+ QUERY_PREALLOC_SIZE	18432
+@@ -336,14 +336,14 @@
+ set @@range_alloc_block_size=default;
+ set @@query_alloc_block_size=default, @@query_prealloc_size=default;
+ set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
+-show variables like '%alloc%';
++show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
+ Variable_name	Value
+ query_alloc_block_size	8192
+ query_prealloc_size	8192
+ range_alloc_block_size	4096
+ transaction_alloc_block_size	8192
+ transaction_prealloc_size	4096
+-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
++select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
+ VARIABLE_NAME	VARIABLE_VALUE
+ QUERY_ALLOC_BLOCK_SIZE	8192
+ QUERY_PREALLOC_SIZE	8192
+
+=== modified file 'mysql-test/t/variables.test'
+--- mysql-test/t/variables.test	2008-11-27 10:50:28 +0000
++++ mysql-test/t/variables.test	2009-01-06 07:28:12 +0000
+@@ -172,21 +172,21 @@
+ set @@rand_seed1=10000000,@@rand_seed2=1000000;
+ select ROUND(RAND(),5);
+ 
+-show variables like '%alloc%';
+-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
++show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
++select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
+ set @@range_alloc_block_size=1024*16;
+ set @@query_alloc_block_size=1024*17+2;
+ set @@query_prealloc_size=1024*18;
+ set @@transaction_alloc_block_size=1024*20-1;
+ set @@transaction_prealloc_size=1024*21-1;
+ select @@query_alloc_block_size;
+-show variables like '%alloc%';
+-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
++show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
++select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
+ set @@range_alloc_block_size=default;
+ set @@query_alloc_block_size=default, @@query_prealloc_size=default;
+ set transaction_alloc_block_size=default, @@transaction_prealloc_size=default;
+-show variables like '%alloc%';
+-select * from information_schema.session_variables where variable_name like '%alloc%' order by 1;
++show variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size');
++select * from information_schema.session_variables where variable_name in ('query_alloc_block_size', 'query_prealloc_size', 'range_alloc_block_size', 'transaction_alloc_block_size', 'transaction_prealloc_size') order by 1;
+ 
+ #
+ # Bug #10904 Illegal mix of collations between
+