| List: | Commits | « Previous MessageNext Message » | |
| From: | Horst Hunger | Date: | July 15 2008 8:26am |
| Subject: | bzr commit into mysql-6.0 branch (horst:2717) | ||
| View as plain text | |||
#At file:///work/bzr/6.0-bugteam/
2717 Horst Hunger 2008-07-15 [merge]
Merge from 5.1
modified:
mysql-test/include/query_prealloc_size_basic.inc
mysql-test/r/query_prealloc_size_basic_32.result
mysql-test/r/query_prealloc_size_basic_64.result
=== modified file 'mysql-test/include/query_prealloc_size_basic.inc'
--- a/mysql-test/include/query_prealloc_size_basic.inc 2008-05-08 18:13:39 +0000
+++ b/mysql-test/include/query_prealloc_size_basic.inc 2008-07-15 06:12:32 +0000
@@ -20,6 +20,7 @@
# #
# Reference: http://dev.mysql.com/doc/refman/5.1/en/ #
# server-system-variables.html #
+# 2008-07-14 hhunger removed values for 64 bit platforms. #
# #
###############################################################################
@@ -74,8 +75,9 @@ SELECT @@session.query_prealloc_size =
SET @@global.query_prealloc_size = 8192;
SELECT @@global.query_prealloc_size ;
-SET @@global.query_prealloc_size = 4294967295;
-SELECT @@global.query_prealloc_size ;
+# Due to problems with 64 bit machines having less than 6 GB main memory.
+#SET @@global.query_prealloc_size = 4294967295;
+#SELECT @@global.query_prealloc_size ;
SET @@global.query_prealloc_size = 655354;
SELECT @@global.query_prealloc_size ;
@@ -89,8 +91,9 @@ SELECT @@global.query_prealloc_size ;
SET @@session.query_prealloc_size = 8192;
SELECT @@session.query_prealloc_size ;
-SET @@session.query_prealloc_size = 4294967295;
-SELECT @@session.query_prealloc_size ;
+# Due to problems with 64 bit machines having less than 6 GB main memory.
+#SET @@session.query_prealloc_size = 4294967295;
+#SELECT @@session.query_prealloc_size ;
SET @@session.query_prealloc_size = 655345;
SELECT @@session.query_prealloc_size ;
@@ -109,8 +112,9 @@ SELECT @@global.query_prealloc_size ;
SET @@global.query_prealloc_size = -1024;
SELECT @@global.query_prealloc_size ;
-SET @@global.query_prealloc_size = 429496729533;
-SELECT @@global.query_prealloc_size ;
+# Due to problems with 64 bit machines having less than 6 GB main memory.
+#SET @@global.query_prealloc_size = 429496729533;
+#SELECT @@global.query_prealloc_size ;
--Error ER_PARSE_ERROR
@@ -237,3 +241,4 @@ SELECT @@session.query_prealloc_size ;
#############################################################
# END OF query_prealloc_size TESTS #
#############################################################
+
=== modified file 'mysql-test/r/query_prealloc_size_basic_32.result'
--- a/mysql-test/r/query_prealloc_size_basic_32.result 2008-05-08 18:13:39 +0000
+++ b/mysql-test/r/query_prealloc_size_basic_32.result 2008-07-15 06:12:32 +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
@@ -69,37 +61,31 @@ Warning 1292 Truncated incorrect query_p
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
8192
-SET @@global.query_prealloc_size = 429496729533;
-Warnings:
-Warning 1292 Truncated incorrect query_prealloc_size value: '429496729533'
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-4294966272
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
-4294966272
+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
-4294966272
+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
-4294966272
+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
-4294966272
+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
-4294966272
+8192
SET @@session.query_prealloc_size = 0;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '0'
=== modified file 'mysql-test/r/query_prealloc_size_basic_64.result'
--- a/mysql-test/r/query_prealloc_size_basic_64.result 2008-05-08 18:13:39 +0000
+++ b/mysql-test/r/query_prealloc_size_basic_64.result 2008-07-15 06:12:32 +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
@@ -69,35 +61,31 @@ Warning 1292 Truncated incorrect query_p
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
+8192
SET @@session.query_prealloc_size = 0;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '0'
| Thread | ||
|---|---|---|
| • bzr commit into mysql-6.0 branch (horst:2717) | Horst Hunger | 16 Jul |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.078 sec. using MySQL 5.1.14-beta-log