#At file:///work/bzr/mysql-5.1-serverqa/
2665 Horst Hunger 2008-07-21
Fixed timeout issue and wrong 64bit result.
modified:
mysql-test/r/query_cache_size_basic_32.result
mysql-test/r/query_cache_size_basic_64.result
mysql-test/r/rpl_recovery_rank_basic_64.result
mysql-test/r/transaction_prealloc_size_basic_32.result
mysql-test/r/transaction_prealloc_size_basic_64.result
mysql-test/suite/system_variables/include/query_cache_size_basic.inc
mysql-test/suite/system_variables/include/transaction_prealloc_size_basic.inc
mysql-test/suite/system_variables/r/query_cache_size_basic_32.result
mysql-test/suite/system_variables/r/query_cache_size_basic_64.result
mysql-test/suite/system_variables/r/rpl_recovery_rank_basic_64.result
mysql-test/suite/system_variables/r/transaction_prealloc_size_basic_32.result
mysql-test/suite/system_variables/r/transaction_prealloc_size_basic_64.result
=== modified file 'mysql-test/r/query_cache_size_basic_32.result'
--- a/mysql-test/r/query_cache_size_basic_32.result 2008-07-17 12:54:58 +0000
+++ b/mysql-test/r/query_cache_size_basic_32.result 2008-07-21 10:54:18 +0000
@@ -47,13 +47,6 @@ SET @@global.query_cache_size = -1;
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;
SELECT @@global.query_cache_size;
@@global.query_cache_size
@@ -67,13 +60,6 @@ SET @@global.query_cache_size = -1024;
SELECT @@global.query_cache_size;
@@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 4294966272; 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'
=== modified file 'mysql-test/r/query_cache_size_basic_64.result'
--- a/mysql-test/r/query_cache_size_basic_64.result 2008-07-17 12:54:58 +0000
+++ b/mysql-test/r/query_cache_size_basic_64.result 2008-07-21 10:54:18 +0000
@@ -47,10 +47,6 @@ SET @@global.query_cache_size = -1;
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;
SELECT @@global.query_cache_size;
@@global.query_cache_size
@@ -64,12 +60,6 @@ SET @@global.query_cache_size = -1024;
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
-SET @@global.query_cache_size = 42949672950;
-Warnings:
-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'
=== modified file 'mysql-test/r/rpl_recovery_rank_basic_64.result'
--- a/mysql-test/r/rpl_recovery_rank_basic_64.result 2008-07-17 12:54:58 +0000
+++ b/mysql-test/r/rpl_recovery_rank_basic_64.result 2008-07-21 10:54:18 +0000
@@ -22,26 +22,20 @@ SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
123456789
SET @@global.rpl_recovery_rank = 2147483648*2;
-Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '4294967296'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
-4294967295
+4294967296
SET @@global.rpl_recovery_rank = 2147483648*1024;
-Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '2199023255552'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
-4294967295
+2199023255552
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
-4294967295
+2199023255552
SET @@global.rpl_recovery_rank = 2147483648*2147483648;
-Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '4611686018427387904'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
-4294967295
+4611686018427387904
'#--------------------FN_DYNVARS_142_03-------------------------#'
SET @@rpl_recovery_rank = 2;
ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
=== modified file 'mysql-test/r/transaction_prealloc_size_basic_32.result'
--- a/mysql-test/r/transaction_prealloc_size_basic_32.result 2008-07-17 12:54:58 +0000
+++ b/mysql-test/r/transaction_prealloc_size_basic_32.result 2008-07-21 10:54:18 +0000
@@ -40,19 +40,11 @@ SET @@global.transaction_prealloc_size =
SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
'#--------------------FN_DYNVARS_005_04-------------------------#'
SET @@session.transaction_prealloc_size = 1024;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
SET @@session.transaction_prealloc_size = 65535;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
@@ -115,12 +107,6 @@ SELECT @@session.transaction_prealloc_si
1024
SET @@session.transaction_prealloc_size = "Test";
ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-Warnings:
-Warning 1292 Truncated incorrect transaction_prealloc_size value: '123456789031'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
'#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -140,7 +126,7 @@ Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '10'
SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
@@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
+1
'#---------------------FN_DYNVARS_001_10----------------------#'
SET @@transaction_prealloc_size = 100;
Warnings:
=== modified file 'mysql-test/r/transaction_prealloc_size_basic_64.result'
--- a/mysql-test/r/transaction_prealloc_size_basic_64.result 2008-07-17 12:54:58 +0000
+++ b/mysql-test/r/transaction_prealloc_size_basic_64.result 2008-07-21 10:54:18 +0000
@@ -40,19 +40,11 @@ SET @@global.transaction_prealloc_size =
SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
'#--------------------FN_DYNVARS_005_04-------------------------#'
SET @@session.transaction_prealloc_size = 1024;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
SET @@session.transaction_prealloc_size = 65535;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
@@ -115,10 +107,6 @@ SELECT @@session.transaction_prealloc_si
1024
SET @@session.transaction_prealloc_size = "Test";
ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-123456788480
'#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -138,7 +126,7 @@ Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '10'
SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
@@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
+1
'#---------------------FN_DYNVARS_001_10----------------------#'
SET @@transaction_prealloc_size = 100;
Warnings:
=== modified file 'mysql-test/suite/system_variables/include/query_cache_size_basic.inc'
--- a/mysql-test/suite/system_variables/include/query_cache_size_basic.inc 2008-07-18 13:49:38 +0000
+++ b/mysql-test/suite/system_variables/include/query_cache_size_basic.inc 2008-07-21 10:54:18 +0000
@@ -83,8 +83,9 @@ 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;
+# Due to timeout if not enough main memory is available.
+#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
@@ -92,8 +93,9 @@ SET @@global.query_cache_size = 10000.01
SELECT @@global.query_cache_size;
SET @@global.query_cache_size = -1024;
SELECT @@global.query_cache_size;
-SET @@global.query_cache_size = 42949672950;
-SELECT @@global.query_cache_size;
+# Due to timeout if not enough main memory is available.
+#SET @@global.query_cache_size = 42949672950;
+#SELECT @@global.query_cache_size;
--echo 'Bug # 34837: Errors are not coming on assigning invalid values to variable';
--Error ER_WRONG_TYPE_FOR_VAR
=== modified file 'mysql-test/suite/system_variables/include/transaction_prealloc_size_basic.inc'
--- a/mysql-test/suite/system_variables/include/transaction_prealloc_size_basic.inc 2008-07-18 13:49:38 +0000
+++ b/mysql-test/suite/system_variables/include/transaction_prealloc_size_basic.inc 2008-07-21 10:54:18 +0000
@@ -77,8 +77,9 @@ SELECT @@global.transaction_prealloc_siz
SET @@global.transaction_prealloc_size = 60020;
SELECT @@global.transaction_prealloc_size;
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
+# Due to timeout if not enough main memory is available.
+#SET @@global.transaction_prealloc_size = 4294966272;
+#SELECT @@global.transaction_prealloc_size;
--echo '#--------------------FN_DYNVARS_005_04-------------------------#'
@@ -89,8 +90,9 @@ SELECT @@global.transaction_prealloc_siz
SET @@session.transaction_prealloc_size = 1024;
SELECT @@session.transaction_prealloc_size;
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
+# Due to timeout if not enough main memory is available.
+#SET @@session.transaction_prealloc_size =4294966272;
+#SELECT @@session.transaction_prealloc_size;
SET @@session.transaction_prealloc_size = 65535;
SELECT @@session.transaction_prealloc_size;
@@ -148,8 +150,9 @@ SELECT @@session.transaction_prealloc_si
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.transaction_prealloc_size = "Test";
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
+# Due to timeout if not enough main memory is available.
+#SET @@session.transaction_prealloc_size = 123456789031;
+#SELECT @@session.transaction_prealloc_size;
--echo '#------------------FN_DYNVARS_005_06-----------------------#'
=== modified file 'mysql-test/suite/system_variables/r/query_cache_size_basic_32.result'
--- a/mysql-test/suite/system_variables/r/query_cache_size_basic_32.result 2008-07-18 13:49:38 +0000
+++ b/mysql-test/suite/system_variables/r/query_cache_size_basic_32.result 2008-07-21 10:54:18 +0000
@@ -47,13 +47,6 @@ SET @@global.query_cache_size = -1;
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;
SELECT @@global.query_cache_size;
@@global.query_cache_size
@@ -67,13 +60,6 @@ SET @@global.query_cache_size = -1024;
SELECT @@global.query_cache_size;
@@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 4294966272; 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'
=== modified file 'mysql-test/suite/system_variables/r/query_cache_size_basic_64.result'
--- a/mysql-test/suite/system_variables/r/query_cache_size_basic_64.result 2008-07-18 13:49:38 +0000
+++ b/mysql-test/suite/system_variables/r/query_cache_size_basic_64.result 2008-07-21 10:54:18 +0000
@@ -47,10 +47,6 @@ SET @@global.query_cache_size = -1;
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;
SELECT @@global.query_cache_size;
@@global.query_cache_size
@@ -64,12 +60,6 @@ SET @@global.query_cache_size = -1024;
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
-SET @@global.query_cache_size = 42949672950;
-Warnings:
-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'
=== modified file 'mysql-test/suite/system_variables/r/rpl_recovery_rank_basic_64.result'
--- a/mysql-test/suite/system_variables/r/rpl_recovery_rank_basic_64.result 2008-07-18 13:49:38 +0000
+++ b/mysql-test/suite/system_variables/r/rpl_recovery_rank_basic_64.result 2008-07-21 10:54:18 +0000
@@ -22,26 +22,20 @@ SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
123456789
SET @@global.rpl_recovery_rank = 2147483648*2;
-Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '4294967296'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
-4294967295
+4294967296
SET @@global.rpl_recovery_rank = 2147483648*1024;
-Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '2199023255552'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
-4294967295
+2199023255552
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
-4294967295
+2199023255552
SET @@global.rpl_recovery_rank = 2147483648*2147483648;
-Warnings:
-Warning 1292 Truncated incorrect rpl-recovery-rank value: '4611686018427387904'
SELECT @@global.rpl_recovery_rank;
@@global.rpl_recovery_rank
-4294967295
+4611686018427387904
'#--------------------FN_DYNVARS_142_03-------------------------#'
SET @@rpl_recovery_rank = 2;
ERROR HY000: Variable 'rpl_recovery_rank' is a GLOBAL variable and should be set with SET GLOBAL
=== modified file 'mysql-test/suite/system_variables/r/transaction_prealloc_size_basic_32.result'
--- a/mysql-test/suite/system_variables/r/transaction_prealloc_size_basic_32.result 2008-07-18 13:49:38 +0000
+++ b/mysql-test/suite/system_variables/r/transaction_prealloc_size_basic_32.result 2008-07-21 10:54:18 +0000
@@ -40,19 +40,11 @@ SET @@global.transaction_prealloc_size =
SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
'#--------------------FN_DYNVARS_005_04-------------------------#'
SET @@session.transaction_prealloc_size = 1024;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
SET @@session.transaction_prealloc_size = 65535;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
@@ -115,12 +107,6 @@ SELECT @@session.transaction_prealloc_si
1024
SET @@session.transaction_prealloc_size = "Test";
ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-Warnings:
-Warning 1292 Truncated incorrect transaction_prealloc_size value: '123456789031'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
'#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -140,7 +126,7 @@ Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '10'
SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
@@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
+1
'#---------------------FN_DYNVARS_001_10----------------------#'
SET @@transaction_prealloc_size = 100;
Warnings:
=== modified file 'mysql-test/suite/system_variables/r/transaction_prealloc_size_basic_64.result'
--- a/mysql-test/suite/system_variables/r/transaction_prealloc_size_basic_64.result 2008-07-18 13:49:38 +0000
+++ b/mysql-test/suite/system_variables/r/transaction_prealloc_size_basic_64.result 2008-07-21 10:54:18 +0000
@@ -40,19 +40,11 @@ SET @@global.transaction_prealloc_size =
SELECT @@global.transaction_prealloc_size;
@@global.transaction_prealloc_size
59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
'#--------------------FN_DYNVARS_005_04-------------------------#'
SET @@session.transaction_prealloc_size = 1024;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
SET @@session.transaction_prealloc_size = 65535;
SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size
@@ -115,10 +107,6 @@ SELECT @@session.transaction_prealloc_si
1024
SET @@session.transaction_prealloc_size = "Test";
ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-123456788480
'#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -138,7 +126,7 @@ Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '10'
SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
@@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
+1
'#---------------------FN_DYNVARS_001_10----------------------#'
SET @@transaction_prealloc_size = 100;
Warnings:
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (horst:2665) | Horst Hunger | 22 Jul |
