4690 Akhila Maddukuri 2012-10-09
Bug#13875534 TESTS FOR OUT-OF-BOUND AND DEFAULT VALUES OF VARIABLES IN
SYS_VARS SUITE IN MTR
modified:
mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result
mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result
mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test
mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic.test
mysql-test/suite/sys_vars/t/key_buffer_size_basic.test
mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test
4689 Tor Didriksen 2012-10-09 [merge]
merge 5.6 => trunk
modified:
CMakeLists.txt
libmysql/CMakeLists.txt
=== modified file 'mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result'
--- a/mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result 2012-09-04 06:05:06 +0000
+++ b/mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result 2012-10-09 16:10:11 +0000
@@ -41,9 +41,9 @@ set session innodb_io_capacity=233;
ERROR HY000: Variable 'innodb_io_capacity' is a GLOBAL variable and should be set with SET GLOBAL
set @@global.innodb_io_capacity=100;
set @@global.innodb_io_capacity=DEFAULT;
-select @@global.innodb_io_capacity;
-@@global.innodb_io_capacity
-200
+select @@global.innodb_io_capacity IN (18446744073709551615,4294967295);
+@@global.innodb_io_capacity IN (18446744073709551615,4294967295)
+0
set global innodb_io_capacity=1.1;
ERROR 42000: Incorrect argument type to variable 'innodb_io_capacity'
set global innodb_io_capacity=1e1;
=== modified file 'mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result'
--- a/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result 2012-09-04 06:05:06 +0000
+++ b/mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result 2012-10-09 16:10:11 +0000
@@ -55,20 +55,16 @@ ERROR 42000: Incorrect argument type to
SELECT @@global.innodb_max_purge_lag;
@@global.innodb_max_purge_lag
0
-SEt @@global.innodb_max_purge_lag = 4294967297;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-4294967297
SET @@global.innodb_max_purge_lag = ' ';
ERROR 42000: Incorrect argument type to variable 'innodb_max_purge_lag'
SELECT @@global.innodb_max_purge_lag;
@@global.innodb_max_purge_lag
-4294967297
+0
SET @@global.innodb_max_purge_lag = " ";
ERROR 42000: Incorrect argument type to variable 'innodb_max_purge_lag'
SELECT @@global.innodb_max_purge_lag;
@@global.innodb_max_purge_lag
-4294967297
+0
'#----------------------FN_DYNVARS_046_05------------------------#'
SELECT @@global.innodb_max_purge_lag =
VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -78,22 +74,22 @@ VARIABLE_VALUE
1
SELECT @@global.innodb_max_purge_lag;
@@global.innodb_max_purge_lag
-4294967297
+0
SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='innodb_max_purge_lag';
VARIABLE_VALUE
-4294967297
+0
'#---------------------FN_DYNVARS_046_06-------------------------#'
SET @@global.innodb_max_purge_lag = OFF;
ERROR 42000: Incorrect argument type to variable 'innodb_max_purge_lag'
SELECT @@global.innodb_max_purge_lag;
@@global.innodb_max_purge_lag
-4294967297
+0
SET @@global.innodb_max_purge_lag = ON;
ERROR 42000: Incorrect argument type to variable 'innodb_max_purge_lag'
SELECT @@global.innodb_max_purge_lag;
@@global.innodb_max_purge_lag
-4294967297
+0
'#---------------------FN_DYNVARS_046_07----------------------#'
SET @@global.innodb_max_purge_lag = TRUE;
SELECT @@global.innodb_max_purge_lag;
=== modified file 'mysql-test/suite/sys_vars/r/key_buffer_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result 2012-10-09 06:16:17 +0000
+++ b/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result 2012-10-09 16:10:11 +0000
@@ -35,38 +35,34 @@ SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 429380394747;
Warnings:
Warning 1292 Truncated incorrect key_buffer_size value: '429380394747'
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-429380390912
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
+@@global.key_buffer_size IN (429380390912,4294963200)
+1
SET @@global.key_buffer_size = 10000.01;
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-429380390912
-SET @@global.key_buffer_size = 4294967296;
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-4294967296
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
+@@global.key_buffer_size IN (429380390912,4294963200)
+1
SET @@global.key_buffer_size = ' ';
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-4294967296
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
+@@global.key_buffer_size IN (429380390912,4294963200)
+1
SET @@global.key_buffer_size = " ";
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-4294967296
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
+@@global.key_buffer_size IN (429380390912,4294963200)
+1
SET @@global.key_buffer_size = ON;
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-4294967296
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
+@@global.key_buffer_size IN (429380390912,4294963200)
+1
SET @@global.key_buffer_size = 'test';
ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-4294967296
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
+@@global.key_buffer_size IN (429380390912,4294963200)
+1
'#-------------------FN_DYNVARS_055_05----------------------------#'
SET @@session.key_buffer_size = 0;
ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
=== modified file 'mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result'
--- a/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result 2012-09-04 06:05:06 +0000
+++ b/mysql-test/suite/sys_vars/r/query_prealloc_size_basic.result 2012-10-09 16:10:11 +0000
@@ -68,39 +68,39 @@ SELECT @@global.query_prealloc_size ;
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
-429496728576
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
+@@global.query_prealloc_size IN (429496728576,4294966272)
+1
SET @@global.query_prealloc_size = 65530.34;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-429496728576
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
+@@global.query_prealloc_size IN (429496728576,4294966272)
+1
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
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272);
+@@global.query_prealloc_size IN (429496728576,4294966272)
+1
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
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
+@@global.query_prealloc_size IN (429496728576,4294966272)
+1
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
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
+@@global.query_prealloc_size IN (429496728576,4294966272)
+1
SET @@global.query_prealloc_size = ' ';
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
-SELECT @@global.query_prealloc_size ;
-@@global.query_prealloc_size
-429496728576
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
+@@global.query_prealloc_size IN (429496728576,4294966272)
+1
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
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
+@@global.query_prealloc_size IN (429496728576,4294966272)
+1
SET @@session.query_prealloc_size = 0;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '0'
@@ -115,30 +115,30 @@ SELECT @@session.query_prealloc_size ;
8192
SET @@session.query_prealloc_size = 65530.34;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
-8192
+SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
+@@session.query_prealloc_size IN (429496728576,4294966272)
+0
SET @@session.query_prealloc_size = 429496729533;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '429496729533'
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
-429496728576
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272);
+@@global.query_prealloc_size IN (429496728576,4294966272)
+1
SET @@session.query_prealloc_size = test;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
-429496728576
+SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
+@@session.query_prealloc_size IN (429496728576,4294966272)
+1
SET @@session.query_prealloc_size = "test";
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
-429496728576
+SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
+@@session.query_prealloc_size IN (429496728576,4294966272)
+1
SET @@session.query_prealloc_size = " ";
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
-SELECT @@session.query_prealloc_size ;
-@@session.query_prealloc_size
-429496728576
+SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
+@@session.query_prealloc_size IN (429496728576,4294966272)
+1
'#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.query_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
=== modified file 'mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test'
--- a/mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test 2012-09-04 06:05:06 +0000
+++ b/mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test 2012-10-09 16:10:11 +0000
@@ -40,7 +40,7 @@ set session innodb_io_capacity=233;
set @@global.innodb_io_capacity=100;
set @@global.innodb_io_capacity=DEFAULT;
-select @@global.innodb_io_capacity;
+select @@global.innodb_io_capacity IN (18446744073709551615,4294967295);
#
# incorrect types
=== modified file 'mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic.test'
--- a/mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic.test 2012-09-04 06:05:06 +0000
+++ b/mysql-test/suite/sys_vars/t/innodb_max_purge_lag_basic.test 2012-10-09 16:10:11 +0000
@@ -95,8 +95,7 @@ SET @@global.innodb_max_purge_lag = 1.1;
SELECT @@global.innodb_max_purge_lag;
-SEt @@global.innodb_max_purge_lag = 4294967297;
-SELECT @@global.innodb_max_purge_lag;
+
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.innodb_max_purge_lag = ' ';
SELECT @@global.innodb_max_purge_lag;
=== modified file 'mysql-test/suite/sys_vars/t/key_buffer_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test 2012-10-09 06:16:17 +0000
+++ b/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test 2012-10-09 16:10:11 +0000
@@ -78,28 +78,26 @@ SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = -1024;
SELECT @@global.key_buffer_size;
SET @@global.key_buffer_size = 429380394747;
-SELECT @@global.key_buffer_size;
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = 10000.01;
-SELECT @@global.key_buffer_size;
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
-SET @@global.key_buffer_size = 4294967296;
-SELECT @@global.key_buffer_size;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = ' ';
-SELECT @@global.key_buffer_size;
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = " ";
-SELECT @@global.key_buffer_size;
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = ON;
-SELECT @@global.key_buffer_size;
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.key_buffer_size = 'test';
-SELECT @@global.key_buffer_size;
+SELECT @@global.key_buffer_size IN (429380390912,4294963200);
--echo '#-------------------FN_DYNVARS_055_05----------------------------#'
###########################################################################
=== modified file 'mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test'
--- a/mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test 2012-09-04 06:05:06 +0000
+++ b/mysql-test/suite/sys_vars/t/query_prealloc_size_basic.test 2012-10-09 16:10:11 +0000
@@ -109,32 +109,32 @@ 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 ;
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.query_prealloc_size = 65530.34;
-SELECT @@global.query_prealloc_size ;
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.query_prealloc_size = test;
-SELECT @@global.query_prealloc_size ;
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272);
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.query_prealloc_size = "test";
-SELECT @@global.query_prealloc_size ;
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.query_prealloc_size = 'test';
-SELECT @@global.query_prealloc_size ;
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.query_prealloc_size = ' ';
-SELECT @@global.query_prealloc_size ;
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@global.query_prealloc_size = ON;
-SELECT @@global.query_prealloc_size ;
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272) ;
SET @@session.query_prealloc_size = 0;
@@ -145,22 +145,22 @@ SELECT @@session.query_prealloc_size ;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.query_prealloc_size = 65530.34;
-SELECT @@session.query_prealloc_size ;
+SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
SET @@session.query_prealloc_size = 429496729533;
-SELECT @@session.query_prealloc_size ;
+SELECT @@global.query_prealloc_size IN (429496728576,4294966272);
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.query_prealloc_size = test;
-SELECT @@session.query_prealloc_size ;
+SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.query_prealloc_size = "test";
-SELECT @@session.query_prealloc_size ;
+SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
--Error ER_WRONG_TYPE_FOR_VAR
SET @@session.query_prealloc_size = " ";
-SELECT @@session.query_prealloc_size ;
+SELECT @@session.query_prealloc_size IN (429496728576,4294966272) ;
--echo '#------------------FN_DYNVARS_005_06-----------------------#'
####################################################################
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (akhila.x.maddukuri:4689 to 4690)Bug#13875534 | Akhila Maddukuri | 9 Oct |
