From c9e9b9583e1d3bec1f208f2a7faed08b1f8bf2ad Mon Sep 17 00:00:00 2001
From: Matthias Leich <Matthias.Leich@sun.com>
Date: Thu, 26 Mar 2009 19:12:19 +0100
Subject: [PATCH] Fix for Bug#43383 main.variables-big : Weak testing code and
 result including modifications according to code review + backport of the fix
 for   Bug 41932 funcs_1: is_collation_character_set_applicability path       
               too long for tar   which was missing in 5.0 (just a renaming of
 two files)

---
 mysql-test/r/variables-big.result             | 34 +++++------
 ...ty.result => is_coll_char_set_appl.result} |  0
 ...bility.test => is_coll_char_set_appl.test} |  0
 mysql-test/t/variables-big.test               | 57 +++++++++++++++----
 4 files changed, 61 insertions(+), 30 deletions(-)
 rename mysql-test/suite/funcs_1/r/{is_collation_character_set_applicability.result => is_coll_char_set_appl.result} (100%)
 rename mysql-test/suite/funcs_1/t/{is_collation_character_set_applicability.test => is_coll_char_set_appl.test} (100%)

diff --git a/mysql-test/r/variables-big.result b/mysql-test/r/variables-big.result
index c441f27d82d..960fc6d22f4 100644
--- a/mysql-test/r/variables-big.result
+++ b/mysql-test/r/variables-big.result
@@ -1,24 +1,20 @@
-set session transaction_prealloc_size=1024*1024*1024*1;
-show processlist;
+SET SESSION transaction_prealloc_size=1024*1024*1024*1;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
-set session transaction_prealloc_size=1024*1024*1024*2;
-show processlist;
+<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+SET SESSION transaction_prealloc_size=1024*1024*1024*2;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	1	NULL	show processlist
-set session transaction_prealloc_size=1024*1024*1024*3;
-show processlist;
+<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+SET SESSION transaction_prealloc_size=1024*1024*1024*3;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
-set session transaction_prealloc_size=1024*1024*1024*4;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '4294967296'
-show processlist;
+<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+SET SESSION transaction_prealloc_size=1024*1024*1024*4;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
-set session transaction_prealloc_size=1024*1024*1024*5;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '5368709120'
-show processlist;
+<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
+SET SESSION transaction_prealloc_size=1024*1024*1024*5;
+SHOW PROCESSLIST;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
+<Id>	root	localhost	test	Query	<Time>	NULL	SHOW PROCESSLIST
diff --git a/mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result b/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
similarity index 100%
rename from mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result
rename to mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
diff --git a/mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test b/mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
similarity index 100%
rename from mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test
rename to mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
diff --git a/mysql-test/t/variables-big.test b/mysql-test/t/variables-big.test
index 43326f3d016..fdb11ffa907 100644
--- a/mysql-test/t/variables-big.test
+++ b/mysql-test/t/variables-big.test
@@ -5,16 +5,51 @@
 --source include/big_test.inc
 
 #
-# Bug #27322  	failure to allocate transaction_prealloc_size causes crash
+# Bug#27322 failure to allocate transaction_prealloc_size causes crash
+#
+#
+# Manual (6.0):
+# Platform Bit Size  Range                      Default
+# 32                 1024-4294967295 (4 Gi - 1) 4096
+# 64                 1024-18446744073709547520  4096
+#
+# Observation(mleich):
+# 1. - Linux 64 Bit, MySQL 64 Bit, 4 GiB RAM, 8 GiB swap
+#    - SET SESSION transaction_prealloc_size=1099511627776;
+#      SHOW PROCESSLIST;
+#      Id   User ... Info
+#      <Id> root ... SHOW PROCESSLIST
+#      SELECT @@session.transaction_prealloc_size;
+#      @@session.transaction_prealloc_size
+#      1099511627776
+#      very short runtime in 5.0
+#      excessive resource consumption + long runtime in 5.1 and 6.0
+# 2. - Win in VM, slightly older version of this test, MySQL 5.0
+#    - testcase timeout after 900s
+#      analyze-timeout-mysqld.1.err :
+#      Id User ... Time Info
+#      83 root ... 542  set session transaction_prealloc_size=1024*1024*1024*2
+#      84 root ... 1    SHOW PROCESSLIST
+#
+# There is a significant probablitity that this tests fails with testcase
+# timeout if the testing box is not powerful enough.
 #
 
-set session transaction_prealloc_size=1024*1024*1024*1;
-show processlist;
-set session transaction_prealloc_size=1024*1024*1024*2;
-show processlist;
-set session transaction_prealloc_size=1024*1024*1024*3;
-show processlist;
-set session transaction_prealloc_size=1024*1024*1024*4;
-show processlist;
-set session transaction_prealloc_size=1024*1024*1024*5;
-show processlist;
+--disable_warnings
+SET SESSION transaction_prealloc_size=1024*1024*1024*1;
+--replace_column 1 <Id> 6 <Time>
+SHOW PROCESSLIST;
+SET SESSION transaction_prealloc_size=1024*1024*1024*2;
+--replace_column 1 <Id> 6 <Time>
+SHOW PROCESSLIST;
+SET SESSION transaction_prealloc_size=1024*1024*1024*3;
+--replace_column 1 <Id> 6 <Time>
+SHOW PROCESSLIST;
+SET SESSION transaction_prealloc_size=1024*1024*1024*4;
+--replace_column 1 <Id> 6 <Time>
+SHOW PROCESSLIST;
+SET SESSION transaction_prealloc_size=1024*1024*1024*5;
+--replace_column 1 <Id> 6 <Time>
+SHOW PROCESSLIST;
+--enable_warnings
+