Manual merge of WL#4738 from mysql-next-mr:

- backported code that handles %f/%g arguments in 
my_vsnprintf.c from 6.0 
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c 
from 6.0 
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt() 
- removed unnecessary "--replace-result"s for Windows in 
mysql-test/suite/sys_vars/t/long_query_time_basic.test 
- some test results adjustments

mysql-test/suite/sys_vars/r/all_vars.result

@@ -0,0 +1,12 @@
+create table t1 (test_name text);
+load data infile "MYSQLTEST_VARDIR/tmp/sys_vars.all_vars.txt" into table t1;
+select variable_name as `There should be *no* variables listed below:`
+                    from information_schema.global_variables
+left join t1 on variable_name=test_name where
+test_name is null
+union
+select variable_name from information_schema.session_variables
+left join t1 on variable_name=test_name where
+test_name is null;
+There should be *no* variables listed below:
+drop table t1;

mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result

@@ -71,8 +71,8 @@ Warning	1292	Truncated incorrect auto_increment_increment value: '65536'
 SELECT @@global.auto_increment_increment;
 @@global.auto_increment_increment
 65535
-SET @@global.auto_increment_increment = 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
+SET @@global.auto_increment_increment = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'auto_increment_increment'
 SELECT @@global.auto_increment_increment;
 @@global.auto_increment_increment
 65535
@@ -93,15 +93,14 @@ Warning	1292	Truncated incorrect auto_increment_increment value: '-2'
 SELECT @@session.auto_increment_increment;
 @@session.auto_increment_increment
 1
-SET @@session.auto_increment_increment = 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
+SET @@session.auto_increment_increment = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'auto_increment_increment'
 SET @@session.auto_increment_increment = 65550;
 Warnings:
 Warning	1292	Truncated incorrect auto_increment_increment value: '65550'
 SELECT @@session.auto_increment_increment;
 @@session.auto_increment_increment
 65535
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
 SET @@session.auto_increment_increment = test;
 ERROR 42000: Incorrect argument type to variable 'auto_increment_increment'
 SELECT @@session.auto_increment_increment;

mysql-test/suite/sys_vars/r/auto_increment_increment_func.result

@@ -95,8 +95,6 @@ id	name
 113	Record_8
 115	Record_9
 116	Record_10
-'Bug#35362: Here Record_10 id should be 120 instead of 115 because we'
-'have set the value of variable to 5'
 SET @@session.auto_increment_increment = 1;
 SELECT @@auto_increment_increment;
 @@auto_increment_increment
@@ -189,7 +187,6 @@ id	name
 127	Record_16
 128	Record_17
 129	Record_18
-'Bug#35364: Variable is incrementing some random values on assigning -ve value'
 ## Disconnecting test_con2 ##
 ## Dropping table t1 ##
 DROP table if exists t1;

mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result

@@ -104,7 +104,6 @@ Warning	1292	Truncated incorrect auto_increment_offset value: '65550'
 SELECT @@session.auto_increment_offset;
 @@session.auto_increment_offset
 65535
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@session.auto_increment_offset = ON;
 ERROR 42000: Incorrect argument type to variable 'auto_increment_offset'
 SELECT @@session.auto_increment_offset;

mysql-test/suite/sys_vars/r/auto_increment_offset_func.result

@@ -84,8 +84,6 @@ id	name
 ## Setting value of variable less than last insert id ##
 SET @@session.auto_increment_offset = 5;
 INSERT into t1(name) values('Record_9');
-'Bug#35367: Random value of id is increasing on assigning value to';
-'variable that is less than current offset';
 INSERT into t1(name) values('Record_10');
 INSERT into t1(name) values('Record_11');
 INSERT into t1(name) values('Record_12');
@@ -125,8 +123,6 @@ id	name
 125	Record_12
 134	Record_13
 140	Record_14
-'Bug#35369: Some invalid value of id is increasing on assigning value to';
-'variable that is greater than auto_increment_increment';
 '#--------------------FN_DYNVARS_002_06-------------------------#'
 ## Changing datatype of column id with primary key to SmallInt ##
 ALTER table t1 modify id SMALLINT NOT NULL auto_increment;
@@ -206,8 +202,6 @@ id	name
 180	Record_18
 181	Record_17
 191	Record_18
-'Bug#35370: Some invalid value of id is increasing on assigning negative';
-' value in variable';
 ## Assigning value that is out of range of variable ##
 SET @@auto_increment_offset = 65536;
 Warnings:

mysql-test/suite/sys_vars/r/autocommit_basic.result

@@ -1,4 +1,4 @@
-SET @start_value = @@autocommit;
+SET @start_value = @@global.autocommit;
 SELECT @start_value;
 @start_value
 1
@@ -7,8 +7,7 @@ SET @@autocommit = 0;
 SET @@autocommit = DEFAULT;
 SELECT @@autocommit;
 @@autocommit
-0
-'Bug: variable DEFAULT value not working and is not throwing error'
+1
 '#---------------------FN_DYNVARS_003_02-------------------------#'
 SET @@autocommit = @start_value;
 SELECT @@autocommit = 1;
@@ -50,16 +49,16 @@ SET @@autocommit = '';
 ERROR 42000: Variable 'autocommit' can't be set to the value of ''
 '#-------------------FN_DYNVARS_003_05----------------------------#'
 SET @@global.autocommit = 0;
-ERROR HY000: Variable 'autocommit' is a SESSION variable and can't be used with SET GLOBAL
 SELECT @@global.autocommit;
-ERROR HY000: Variable 'autocommit' is a SESSION variable
+@@global.autocommit
+0
+SET @@global.autocommit = 1;
 '#----------------------FN_DYNVARS_003_06------------------------#'
 SELECT IF(@@session.autocommit, "ON", "OFF") = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
 WHERE VARIABLE_NAME='autocommit';
 IF(@@session.autocommit, "ON", "OFF") = VARIABLE_VALUE
 1
-Bug # 34839: Values in variable and information_schema do not match for autocommit
 '#----------------------FN_DYNVARS_003_07------------------------#'
 SET @@autocommit = 1;
 SELECT IF(@@autocommit, "ON", "OFF") = VARIABLE_VALUE
@@ -111,7 +110,7 @@ SELECT session.autocommit;
 ERROR 42S02: Unknown table 'session' in field list
 SELECT autocommit = @@session.autocommit;
 ERROR 42S22: Unknown column 'autocommit' in 'field list'
-SET @@autocommit = @start_value;
-SELECT @@autocommit;
-@@autocommit
+SET @@global.autocommit = @start_value;
+SELECT @@global.autocommit;
+@@global.autocommit
 1

mysql-test/suite/sys_vars/r/autocommit_func.result

@@ -89,7 +89,6 @@ id	name
 1	Record_1
 2	Record_2
 3	Record_3
-'Bug#35373: Records donot get committed in transaction on switching connections'
 INSERT into t1(name) values('Record_6');
 SELECT * from t1;
 id	name

mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result

@@ -58,7 +58,6 @@ FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 WHERE VARIABLE_NAME='automatic_sp_privileges';
 IF(@@global.automatic_sp_privileges, "ON", "OFF") = VARIABLE_VALUE
 1
-'Bug# 34839: Values in variable and information_schema donot match'
 '#---------------------FN_DYNVARS_004_07----------------------#'
 SET @@global.automatic_sp_privileges = OFF;
 SELECT @@global.automatic_sp_privileges;

mysql-test/suite/sys_vars/r/back_log_basic.result

@@ -0,0 +1,21 @@
+select @@global.back_log;
+@@global.back_log
+50
+select @@session.back_log;
+ERROR HY000: Variable 'back_log' is a GLOBAL variable
+show global variables like 'back_log';
+Variable_name	Value
+back_log	50
+show session variables like 'back_log';
+Variable_name	Value
+back_log	50
+select * from information_schema.global_variables where variable_name='back_log';
+VARIABLE_NAME	VARIABLE_VALUE
+BACK_LOG	50
+select * from information_schema.session_variables where variable_name='back_log';
+VARIABLE_NAME	VARIABLE_VALUE
+BACK_LOG	50
+set global back_log=1;
+ERROR HY000: Variable 'back_log' is a read only variable
+set session back_log=1;
+ERROR HY000: Variable 'back_log' is a read only variable

mysql-test/suite/sys_vars/r/big_tables_basic.result

@@ -7,8 +7,7 @@ SET @@big_tables = 1;
 SET @@big_tables = DEFAULT;
 SELECT @@big_tables;
 @@big_tables
-1
-'Bug# 34829: No default value for variable and setting default does not raise error';
+0
 '#--------------------FN_DYNVARS_005_02------------------------#'
 SET @@big_tables = 0;
 SELECT @@big_tables;
@@ -44,17 +43,17 @@ ERROR 42000: Variable 'big_tables' can't be set to the value of ' '
 SET @@big_tables = '';
 ERROR 42000: Variable 'big_tables' can't be set to the value of ''
 '#-------------------FN_DYNVARS_005_04----------------------------#'
-SET @@global.big_tables = 0;
-ERROR HY000: Variable 'big_tables' is a SESSION variable and can't be used with SET GLOBAL
+SET @@global.big_tables = 1-@@global.big_tables;
 SELECT @@global.big_tables;
-ERROR HY000: Variable 'big_tables' is a SESSION variable
+@@global.big_tables
+1
+SET @@global.big_tables = 1-@@global.big_tables;
 '#----------------------FN_DYNVARS_005_05------------------------#'
 SELECT IF(@@big_tables, "ON", "OFF") = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
 WHERE VARIABLE_NAME='big_tables';
 IF(@@big_tables, "ON", "OFF") = VARIABLE_VALUE
 1
-Bug # 34839: Values in variable and information_schema do not match for autocommit
 '#---------------------FN_DYNVARS_005_06----------------------#'
 SET @@big_tables = OFF;
 SELECT @@big_tables;

mysql-test/suite/sys_vars/r/binlog_cache_size_basic_32.result

@@ -21,14 +21,20 @@ SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 4096
 SET @@global.binlog_cache_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect binlog_cache_size value: '4294967295'
 SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 4294963200
 SET @@global.binlog_cache_size = 10000;
+Warnings:
+Warning	1292	Truncated incorrect binlog_cache_size value: '10000'
 SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 8192
 SET @@global.binlog_cache_size = 21221204;
+Warnings:
+Warning	1292	Truncated incorrect binlog_cache_size value: '21221204'
 SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 21217280

mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result

@@ -21,14 +21,20 @@ SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 4096
 SET @@global.binlog_cache_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect binlog_cache_size value: '4294967295'
 SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 4294963200
 SET @@global.binlog_cache_size = 10000;
+Warnings:
+Warning	1292	Truncated incorrect binlog_cache_size value: '10000'
 SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 8192
 SET @@global.binlog_cache_size = 21221204;
+Warnings:
+Warning	1292	Truncated incorrect binlog_cache_size value: '21221204'
 SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 21217280
@@ -49,6 +55,8 @@ SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 4096
 SET @@global.binlog_cache_size = 42949672950;
+Warnings:
+Warning	1292	Truncated incorrect binlog_cache_size value: '42949672950'
 SELECT @@global.binlog_cache_size;
 @@global.binlog_cache_size
 42949668864

mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result

@@ -91,7 +91,6 @@ Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-2'
 SELECT @@session.bulk_insert_buffer_size;
 @@session.bulk_insert_buffer_size
 0
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@session.bulk_insert_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
 SET @@session.bulk_insert_buffer_size = 429496.10;

mysql-test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result

@@ -87,7 +87,6 @@ Warning	1292	Truncated incorrect bulk_insert_buffer_size value: '-2'
 SELECT @@session.bulk_insert_buffer_size;
 @@session.bulk_insert_buffer_size
 0
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@session.bulk_insert_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'bulk_insert_buffer_size'
 SET @@session.bulk_insert_buffer_size = 429496.10;

mysql-test/suite/sys_vars/r/character_set_client_basic.result

@@ -162,11 +162,8 @@ SET @@character_set_client = utf8;
 SELECT @@character_set_client;
 @@character_set_client
 utf8
-'Bug: Assignment of ucs2 to session character-set does not raise error';
-'but selecting variable after setting it does.'; 
-'Even catching this does not allow any further character-set to be set.';
-'Offending querry seems to be:';
-'SET @@character_set_client = ucs2;'
+SET @@character_set_client = ucs2;
+ERROR 42000: Variable 'character_set_client' can't be set to the value of 'ucs2'
 SET @@character_set_client = cp866;
 SELECT @@character_set_client;
 @@character_set_client
@@ -426,9 +423,6 @@ SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
 SELECT @total_charset;
 @total_charset
 36
-'Bug # 34843: character sets are mapped in such a way that 100 and following';
-'numbers gives error, and before 100 the 36 mapped wraps arround';
-'several times.';
 '#--------------------FN_DYNVARS_010_10-------------------------#'
 SET @@character_set_client = abc;
 ERROR 42000: Unknown character set: 'abc'

mysql-test/suite/sys_vars/r/character_set_client_func.result

@@ -10,7 +10,6 @@ utf8
 SELECT @@session.character_set_client;
 @@session.character_set_client
 latin1
-'Bug# 35372: session character_set_client is not effected by global character_set_client'
 '#--------------------FN_DYNVARS_010_02-------------------------#'
 'connection default'
 SHOW VARIABLES like 'character_set_client';
@@ -22,16 +21,16 @@ CREATE TABLE t1(a CHAR(3) character set utf8);
 'For latin1 characterset';
 SET @@session.character_set_client = latin1;
 INSERT INTO t1 values('<03>');
-SELECT a,CHAR_LENGTH(a) FROM t1;
-a	CHAR_LENGTH(a)
-<03>	2
+SELECT hex(a),CHAR_LENGTH(a) FROM t1;
+hex(a)	CHAR_LENGTH(a)
+03C3A8	2
 DELETE FROM t1;
 'For utf8 characterset';
 SET @@session.character_set_client = utf8;
 INSERT INTO t1 values('<03>');
-SELECT a,CHAR_LENGTH(a) FROM t1;
-a	CHAR_LENGTH(a)
-	1
+SELECT hex(a),CHAR_LENGTH(a) FROM t1;
+hex(a)	CHAR_LENGTH(a)
+03	1
 DELETE FROM t1;
 DROP TABLE IF EXISTS t1;
 SET @@global.character_set_client = @global_character_set_client;

mysql-test/suite/sys_vars/r/character_set_connection_basic.result

@@ -425,9 +425,6 @@ SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
 SELECT @total_charset;
 @total_charset
 36
-'Bug # 34843: character sets are mapped in such a way that 100 and following ';
-'numbers gives error, and before 100 the 36 mapped wraps arround';
-'several times.';
 '#--------------------FN_DYNVARS_011_10-------------------------#'
 SET @@character_set_connection = abc;
 ERROR 42000: Unknown character set: 'abc'

mysql-test/suite/sys_vars/r/character_set_database_basic.result

@@ -425,8 +425,6 @@ SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
 SELECT @total_charset;
 @total_charset
 36
-'Bug # 34843: character sets are mapped in such a way that 100 and following';
-'numbers gives error, and before 100 the 36 mapped wraps arround several times.';
 '#--------------------FN_DYNVARS_012_10-------------------------#'
 SET @@character_set_database = "grek";
 ERROR 42000: Unknown character set: 'grek'

mysql-test/suite/sys_vars/r/character_set_database_func.result

@@ -12,7 +12,6 @@ utf8
 SELECT @@session.character_set_database;
 @@session.character_set_database
 latin1
-'Bug#35356: session character_set_database differ from global character_set_database'
 '#--------------------FN_DYNVARS_008_02-------------------------#'
 'connection default'
 DROP TABLE IF EXISTS t1;
@@ -39,7 +38,6 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
 DROP TABLE t1;
 DROP DATABASE db1;
-'Bug#35357: character_set_database does not effects CREATE DATABASE without characater set'
 '--ascii character set specified--'
 CREATE DATABASE db1 CHARACTER SET ascii;
 USE db1;
@@ -72,7 +70,6 @@ SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1;
 count(*)
 1
 DROP TABLE IF EXISTS t1;
-'Bug#27208: If no current database, character_set_database !=character_set_server'
 SET GLOBAL character_set_server=latin5;
 CREATE DATABASE csdb CHARACTER SET = utf8;
 USE csdb;

mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result

@@ -403,8 +403,6 @@ SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
 SELECT @total_charset;
 @total_charset
 36
-'Bug # 34843: character sets are mapped in such a way that 100 and following '
-'numbers give error, and before 100 the 36 mapped wraps arround several times.'
 '#--------------------FN_DYNVARS_008_10-------------------------#'
 SET @@character_set_filesystem = abc;
 ERROR 42000: Unknown character set: 'abc'

mysql-test/suite/sys_vars/r/character_set_server_basic.result

@@ -29,6 +29,8 @@ ERROR 42S22: Unknown column 'session' in 'field list'
 SET global character_set_server=utf8;
 SELECT global character_set_server;
 ERROR 42S22: Unknown column 'global' in 'field list'
+SET @@character_set_server = null;
+ERROR 42000: Variable 'character_set_server' can't be set to the value of 'NULL'
 '#--------------------FN_DYNVARS_009_02-------------------------#'
 SET @@character_set_server = latin5;
 SET @@character_set_server = DEFAULT;
@@ -417,13 +419,6 @@ SELECT @@global.character_set_server;
 cp1250
 SET @@global.character_set_server = 100;
 ERROR 42000: Unknown character set: '100'
-SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS);
-SELECT @total_charset;
-@total_charset
-36
-'Bug # 34843: character sets are mapped in such a way that 100 and following ';
-'numbers gives error, and before 100 the 36 mapped wraps arround ';
-'several times.';
 '#--------------------FN_DYNVARS_009_10-------------------------#'
 SET @@character_set_server = abc;
 ERROR 42000: Unknown character set: 'abc'

mysql-test/suite/sys_vars/r/character_sets_dir_basic.result

@@ -0,0 +1,21 @@
+select @@global.character_sets_dir;
+@@global.character_sets_dir
+MYSQL_SHAREDIR/charsets/
+select @@session.character_sets_dir;
+ERROR HY000: Variable 'character_sets_dir' is a GLOBAL variable
+show global variables like 'character_sets_dir';
+Variable_name	Value
+character_sets_dir	MYSQL_SHAREDIR/charsets/
+show session variables like 'character_sets_dir';
+Variable_name	Value
+character_sets_dir	MYSQL_SHAREDIR/charsets/
+select * from information_schema.global_variables where variable_name='character_sets_dir';
+VARIABLE_NAME	VARIABLE_VALUE
+CHARACTER_SETS_DIR	MYSQL_SHAREDIR/charsets/
+select * from information_schema.session_variables where variable_name='character_sets_dir';
+VARIABLE_NAME	VARIABLE_VALUE
+CHARACTER_SETS_DIR	MYSQL_SHAREDIR/charsets/
+set global character_sets_dir="foo";
+ERROR HY000: Variable 'character_sets_dir' is a read only variable
+set session character_sets_dir="foo";
+ERROR HY000: Variable 'character_sets_dir' is a read only variable

mysql-test/suite/sys_vars/r/collation_database_basic.result

@@ -32,9 +32,12 @@ ERROR 42S22: Unknown column 'global' in 'field list'
 '#--------------------FN_DYNVARS_016_02-------------------------#'
 SET @@collation_database = latin1_bin;
 SET @@collation_database = DEFAULT;
+SELECT DEFAULT_COLLATION_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME=DATABASE();
+DEFAULT_COLLATION_NAME
+latin1_swedish_ci
 SELECT @@collation_database AS DEFAULT_VALUE;
 DEFAULT_VALUE
-utf8_unicode_ci
+latin1_swedish_ci
 SET @@global.collation_database = latin1_bin;
 SET @@global.collation_database = DEFAULT;
 SELECT @@global.collation_database;

mysql-test/suite/sys_vars/r/collation_database_func.result

@@ -11,7 +11,6 @@ latin1_danish_ci
 SELECT @@session.collation_database;
 @@session.collation_database
 latin1_swedish_ci
-'Bug#35378: New session collation_database is not change by global collation_database'
 '#--------------------FN_DYNVARS_011_02-------------------------#'
 'connection default'
 DROP TABLE IF EXISTS t1,t2;
@@ -31,7 +30,6 @@ USE db1;
 SHOW CREATE DATABASE db1;
 Database	Create Database
 db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_roman_ci */
-'Bug#35380: collation_database does not effects CREATE DATABASE without characater set'
 CREATE TABLE t1(a CHAR(20));
 SHOW CREATE TABLE t1;
 Table	Create Table

mysql-test/suite/sys_vars/r/completion_type_basic.result

@@ -1,58 +1,74 @@
 SET @start_global_value = @@global.completion_type;
 SELECT @start_global_value;
 @start_global_value
-0
+NO_CHAIN
 SET @start_session_value = @@session.completion_type;
 SELECT @start_session_value;
 @start_session_value
-0
+NO_CHAIN
 '#--------------------FN_DYNVARS_017_01-------------------------#'
 SET @@global.completion_type = 2;
 SET @@global.completion_type = DEFAULT;
 SELECT @@global.completion_type;
 @@global.completion_type
-0
+NO_CHAIN
 SET @@session.completion_type = 1;
 SET @@session.completion_type = DEFAULT;
 SELECT @@session.completion_type;
 @@session.completion_type
-0
-'#--------------------FN_DYNVARS_017_02-------------------------#'
-SET @@global.completion_type = @start_global_value;
-SELECT @@global.completion_type = 0;
-@@global.completion_type = 0
-1
-SET @@session.completion_type = @start_session_value;
-SELECT @@session.completion_type = 0;
-@@session.completion_type = 0
-1
+NO_CHAIN
 '#--------------------FN_DYNVARS_017_03-------------------------#'
 SET @@global.completion_type = 0;
 SELECT @@global.completion_type;
 @@global.completion_type
-0
+NO_CHAIN
 SET @@global.completion_type = 1;
 SELECT @@global.completion_type;
 @@global.completion_type
-1
+CHAIN
 SET @@global.completion_type = 2;
 SELECT @@global.completion_type;
 @@global.completion_type
-2
+RELEASE
+SET @@global.completion_type = NO_CHAIN;
+SELECT @@global.completion_type;
+@@global.completion_type
+NO_CHAIN
+SET @@global.completion_type = CHAIN;
+SELECT @@global.completion_type;
+@@global.completion_type
+CHAIN
+SET @@global.completion_type = 'RELEASE';
+SELECT @@global.completion_type;
+@@global.completion_type
+RELEASE
 '#--------------------FN_DYNVARS_017_04-------------------------#'
 SET @@session.completion_type = 0;
 SELECT @@session.completion_type;
 @@session.completion_type
-0
+NO_CHAIN
 SET @@session.completion_type = 1;
 SELECT @@session.completion_type;
 @@session.completion_type
-1
+CHAIN
 SET @@session.completion_type = 2;
 SELECT @@session.completion_type;
 @@session.completion_type
-2
+RELEASE
+SET @@session.completion_type = 'NO_CHAIN';
+SELECT @@session.completion_type;
+@@session.completion_type
+NO_CHAIN
+SET @@session.completion_type = 'CHAIN';
+SELECT @@session.completion_type;
+@@session.completion_type
+CHAIN
+SET @@session.completion_type = 'RELEASE';
+SELECT @@session.completion_type;
+@@session.completion_type
+RELEASE
 '#------------------FN_DYNVARS_017_05-----------------------#'
+set sql_mode=TRADITIONAL;
 SET @@global.completion_type = 10;
 ERROR 42000: Variable 'completion_type' can't be set to the value of '10'
 SET @@global.completion_type = -1024;
@@ -60,7 +76,7 @@ ERROR 42000: Variable 'completion_type' can't be set to the value of '-1024'
 SET @@global.completion_type = 2.4;
 ERROR 42000: Incorrect argument type to variable 'completion_type'
 SET @@global.completion_type = OFF;
-ERROR 42000: Incorrect argument type to variable 'completion_type'
+ERROR 42000: Variable 'completion_type' can't be set to the value of 'OFF'
 SET @@session.completion_type = 10;
 ERROR 42000: Variable 'completion_type' can't be set to the value of '10'
 SET @@session.completion_type = -2;
@@ -68,7 +84,7 @@ ERROR 42000: Variable 'completion_type' can't be set to the value of '-2'
 SET @@session.completion_type = 1.2;
 ERROR 42000: Incorrect argument type to variable 'completion_type'
 SET @@session.completion_type = ON;
-ERROR 42000: Incorrect argument type to variable 'completion_type'
+ERROR 42000: Variable 'completion_type' can't be set to the value of 'ON'
 '#------------------FN_DYNVARS_017_06-----------------------#'
 SELECT @@global.completion_type = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
@@ -84,11 +100,11 @@ WHERE VARIABLE_NAME='completion_type';
 SET @@global.completion_type = TRUE;
 SELECT @@global.completion_type;
 @@global.completion_type
-1
+CHAIN
 SET @@global.completion_type = FALSE;
 SELECT @@global.completion_type;
 @@global.completion_type
-0
+NO_CHAIN
 '#---------------------FN_DYNVARS_001_08----------------------#'
 SET @@completion_type = 1;
 SELECT @@completion_type = @@local.completion_type;
@@ -101,7 +117,7 @@ SELECT @@local.completion_type = @@session.completion_type;
 SET completion_type = 1;
 SELECT @@completion_type;
 @@completion_type
-1
+CHAIN
 SET local.completion_type = 1;
 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 'completion_type = 1' at line 1
 SELECT local.completion_type;
@@ -115,8 +131,9 @@ ERROR 42S22: Unknown column 'completion_type' in 'field list'
 SET @@global.completion_type = @start_global_value;
 SELECT @@global.completion_type;
 @@global.completion_type
-0
+NO_CHAIN
 SET @@session.completion_type = @start_session_value;
 SELECT @@session.completion_type;
 @@session.completion_type
-0
+NO_CHAIN
+set sql_mode='';

mysql-test/suite/sys_vars/r/concurrent_insert_basic.result

@@ -1,65 +1,70 @@
 SET @start_value = @@global.concurrent_insert;
 SELECT @start_value;
 @start_value
-1
+AUTO
 '#--------------------FN_DYNVARS_018_01------------------------#'
 SET @@global.concurrent_insert = 0;
 SET @@global.concurrent_insert = DEFAULT;
 SELECT @@global.concurrent_insert;
 @@global.concurrent_insert
-1
+AUTO
 '#---------------------FN_DYNVARS_018_02-------------------------#'
 SET @@global.concurrent_insert = DEFAULT;
 SELECT @@global.concurrent_insert = 1;
 @@global.concurrent_insert = 1
-1
+0
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: 'AUTO'
 '#--------------------FN_DYNVARS_018_03------------------------#'
 SET @@global.concurrent_insert = 0;
 SELECT @@global.concurrent_insert;
 @@global.concurrent_insert
-0
+NEVER
 SET @@global.concurrent_insert = 1;
 SELECT @@global.concurrent_insert;
 @@global.concurrent_insert
-1
+AUTO
 SET @@global.concurrent_insert = 2;
 SELECT @@global.concurrent_insert;
 @@global.concurrent_insert
-2
+ALWAYS
+SET @@global.concurrent_insert = NEVER;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+NEVER
+SET @@global.concurrent_insert = AUTO;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+AUTO
+SET @@global.concurrent_insert = ALWAYS;
+SELECT @@global.concurrent_insert;
+@@global.concurrent_insert
+ALWAYS
 '#--------------------FN_DYNVARS_018_04-------------------------#'
 SET @@global.concurrent_insert = -1;
-Warnings:
-Warning	1292	Truncated incorrect concurrent_insert value: '-1'
-Select @@global.concurrent_insert;
-@@global.concurrent_insert
-0
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of '-1'
 SET @@global.concurrent_insert = 100;
-Warnings:
-Warning	1292	Truncated incorrect concurrent_insert value: '100'
-Select @@global.concurrent_insert;
-@@global.concurrent_insert
-2
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of '100'
 SET @@global.concurrent_insert = TRUEF;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of 'TRUEF'
 SET @@global.concurrent_insert = TRUE_F;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of 'TRUE_F'
 SET @@global.concurrent_insert = FALSE0;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of 'FALSE0'
 SET @@global.concurrent_insert = OON;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of 'OON'
 SET @@global.concurrent_insert = ONN;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of 'ONN'
 SET @@global.concurrent_insert = OOFF;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of 'OOFF'
 SET @@global.concurrent_insert = 0FF;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of '0FF'
 SET @@global.concurrent_insert = ' ';
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of ' '
 SET @@global.concurrent_insert = " ";
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of ' '
 SET @@global.concurrent_insert = '';
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of ''
 '#-------------------FN_DYNVARS_018_05----------------------------#'
 SET @@session.concurrent_insert = 1;
 ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLOBAL
@@ -73,18 +78,18 @@ WHERE VARIABLE_NAME='concurrent_insert';
 1
 '#---------------------FN_DYNVARS_018_07----------------------#'
 SET @@global.concurrent_insert = OFF;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of 'OFF'
 SET @@global.concurrent_insert = ON;
-ERROR 42000: Incorrect argument type to variable 'concurrent_insert'
+ERROR 42000: Variable 'concurrent_insert' can't be set to the value of 'ON'
 '#---------------------FN_DYNVARS_018_08----------------------#'
 SET @@global.concurrent_insert = TRUE;
 SELECT @@global.concurrent_insert;
 @@global.concurrent_insert
-1
+AUTO
 SET @@global.concurrent_insert = FALSE;
 SELECT @@global.concurrent_insert;
 @@global.concurrent_insert
-0
+NEVER
 '#---------------------FN_DYNVARS_018_09----------------------#'
 SET @@global.concurrent_insert = 1;
 SELECT @@concurrent_insert = @@global.concurrent_insert;
@@ -95,7 +100,7 @@ SET concurrent_insert = 1;
 ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT @@concurrent_insert;
 @@concurrent_insert
-1
+AUTO
 SET global.concurrent_insert = 1;
 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 'concurrent_insert = 1' at line 1
 SELECT global.concurrent_insert;
@@ -105,4 +110,4 @@ ERROR 42S22: Unknown column 'concurrent_insert' in 'field list'
 SET @@global.concurrent_insert = @start_value;
 SELECT @@global.concurrent_insert;
 @@global.concurrent_insert
-1
+AUTO

mysql-test/suite/sys_vars/r/concurrent_insert_func.result

@@ -82,7 +82,7 @@ Record_6
 Record_5
 SELECT @@concurrent_insert;
 @@concurrent_insert
-2
+ALWAYS
 connection default;
 ## Unlocking table ##
 UNLOCK TABLES;

mysql-test/suite/sys_vars/r/connect_timeout_basic.result

@@ -45,7 +45,6 @@ Warning	1292	Truncated incorrect connect_timeout value: '42949672950'
 SELECT @@global.connect_timeout;
 @@global.connect_timeout
 31536000
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.connect_timeout = 21221204.10;
 ERROR 42000: Incorrect argument type to variable 'connect_timeout'
 SET @@global.connect_timeout = ON;

mysql-test/suite/sys_vars/r/date_format_basic.result

@@ -0,0 +1,21 @@
+select @@global.date_format;
+@@global.date_format
+%Y-%m-%d
+select @@session.date_format;
+ERROR HY000: Variable 'date_format' is a GLOBAL variable
+show global variables like 'date_format';
+Variable_name	Value
+date_format	%Y-%m-%d
+show session variables like 'date_format';
+Variable_name	Value
+date_format	%Y-%m-%d
+select * from information_schema.global_variables where variable_name='date_format';
+VARIABLE_NAME	VARIABLE_VALUE
+DATE_FORMAT	%Y-%m-%d
+select * from information_schema.session_variables where variable_name='date_format';
+VARIABLE_NAME	VARIABLE_VALUE
+DATE_FORMAT	%Y-%m-%d
+set global date_format="foo";
+ERROR HY000: Variable 'date_format' is a read only variable
+set session date_format="foo";
+ERROR HY000: Variable 'date_format' is a read only variable

mysql-test/suite/sys_vars/r/datetime_format_basic.result

@@ -0,0 +1,21 @@
+select @@global.datetime_format;
+@@global.datetime_format
+%Y-%m-%d %H:%i:%s
+select @@session.datetime_format;
+ERROR HY000: Variable 'datetime_format' is a GLOBAL variable
+show global variables like 'datetime_format';
+Variable_name	Value
+datetime_format	%Y-%m-%d %H:%i:%s
+show session variables like 'datetime_format';
+Variable_name	Value
+datetime_format	%Y-%m-%d %H:%i:%s
+select * from information_schema.global_variables where variable_name='datetime_format';
+VARIABLE_NAME	VARIABLE_VALUE
+DATETIME_FORMAT	%Y-%m-%d %H:%i:%s
+select * from information_schema.session_variables where variable_name='datetime_format';
+VARIABLE_NAME	VARIABLE_VALUE
+DATETIME_FORMAT	%Y-%m-%d %H:%i:%s
+set global datetime_format="foo";
+ERROR HY000: Variable 'datetime_format' is a read only variable
+set session datetime_format="foo";
+ERROR HY000: Variable 'datetime_format' is a read only variable

mysql-test/suite/sys_vars/r/debug_basic.result

@@ -0,0 +1,25 @@
+set session debug="L";
+select @@global.debug="1";
+@@global.debug="1"
+0
+select @@session.debug;
+@@session.debug
+L
+show global variables like 'debug';
+Variable_name	Value
+debug	#
+show session variables like 'debug';
+Variable_name	Value
+debug	L
+select * from information_schema.global_variables where variable_name="debug";
+VARIABLE_NAME	VARIABLE_VALUE
+DEBUG	#
+select * from information_schema.session_variables where variable_name="debug";
+VARIABLE_NAME	VARIABLE_VALUE
+DEBUG	L
+set @@global.debug=1;
+ERROR 42000: Incorrect argument type to variable 'debug'
+set @@global.debug=1.1;
+ERROR 42000: Incorrect argument type to variable 'debug'
+set @@global.debug=1e1;
+ERROR 42000: Incorrect argument type to variable 'debug'

mysql-test/suite/sys_vars/r/debug_sync_basic.result

@@ -0,0 +1,21 @@
+select @@global.debug_sync;
+ERROR HY000: Variable 'debug_sync' is a SESSION variable
+select @@session.debug_sync;
+@@session.debug_sync
+ON - current signal: ''
+show global variables like "debug_sync";
+Variable_name	Value
+show session variables like "debug_sync";
+Variable_name	Value
+debug_sync	ON - current signal: ''
+select * from information_schema.global_variables where variable_name="debug_sync";
+VARIABLE_NAME	VARIABLE_VALUE
+select * from information_schema.session_variables where variable_name="debug_sync";
+VARIABLE_NAME	VARIABLE_VALUE
+DEBUG_SYNC	ON - current signal: ''
+set @@session.debug_sync=1;
+ERROR 42000: Incorrect argument type to variable 'debug_sync'
+set @@session.debug_sync=1.1;
+ERROR 42000: Incorrect argument type to variable 'debug_sync'
+set @@session.debug_sync=1e1;
+ERROR 42000: Incorrect argument type to variable 'debug_sync'

mysql-test/suite/sys_vars/r/default_storage_engine_basic.result

@@ -0,0 +1,117 @@
+SET @start_global_value = @@global.default_storage_engine;
+SELECT @start_global_value;
+@start_global_value
+MyISAM
+SET @start_session_value = @@session.default_storage_engine;
+SELECT @start_session_value;
+@start_session_value
+MyISAM
+'#--------------------FN_DYNVARS_005_01-------------------------#'
+SET @@global.default_storage_engine = INNODB;
+SET @@global.default_storage_engine = DEFAULT;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
+MyISAM
+SET @@session.default_storage_engine = INNODB;
+SET @@session.default_storage_engine = DEFAULT;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
+MyISAM
+'#--------------------FN_DYNVARS_005_02-------------------------#'
+SET @@global.default_storage_engine = MYISAM;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
+MyISAM
+SET @@global.default_storage_engine = MERGE;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
+MRG_MYISAM
+SET @@global.default_storage_engine = MEMORY;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
+MEMORY
+SET @@global.default_storage_engine = INNODB;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
+InnoDB
+'#--------------------FN_DYNVARS_005_03-------------------------#'
+SET @@session.default_storage_engine = MYISAM;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
+MyISAM
+SET @@session.default_storage_engine = MERGE;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
+MRG_MYISAM
+SET @@session.default_storage_engine = MEMORY;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
+MEMORY
+SET @@session.default_storage_engine = INNODB;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
+InnoDB
+'#------------------FN_DYNVARS_005_04-----------------------#'
+SET @@global.default_storage_engine = 8199;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@global.default_storage_engine = NULL;
+ERROR 42000: Variable 'default_storage_engine' can't be set to the value of 'NULL'
+SET @@global.default_storage_engine = -1024;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@global.default_storage_engine = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@global.default_storage_engine = FILE;
+ERROR 42000: Unknown storage engine 'FILE'
+SET @@session.default_storage_engine = 8199;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@session.default_storage_engine = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@session.default_storage_engine = RECORD;
+ERROR 42000: Unknown storage engine 'RECORD'
+'#------------------FN_DYNVARS_005_05-----------------------#'
+SELECT @@global.default_storage_engine =
+VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='default_storage_engine';
+@@global.default_storage_engine =
+VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_005_06-----------------------#'
+SELECT @@session.default_storage_engine =
+VARIABLE_VALUE FROM INFORMATION_SCHEMA.SESSION_VARIABLES
+WHERE VARIABLE_NAME='default_storage_engine';
+@@session.default_storage_engine =
+VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_005_07-----------------------#'
+SET @@global.default_storage_engine = TRUE;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET @@global.default_storage_engine = FALSE;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+'#---------------------FN_DYNVARS_001_8----------------------#'
+SET @@default_storage_engine = MYISAM;
+SELECT @@default_storage_engine = @@local.default_storage_engine;
+@@default_storage_engine = @@local.default_storage_engine
+1
+SELECT @@local.default_storage_engine = @@session.default_storage_engine;
+@@local.default_storage_engine = @@session.default_storage_engine
+1
+'#---------------------FN_DYNVARS_001_9----------------------#'
+SET default_storage_engine = MEMORY;
+SELECT @@default_storage_engine;
+@@default_storage_engine
+MEMORY
+SELECT local.default_storage_engine;
+ERROR 42S02: Unknown table 'local' in field list
+SELECT session.default_storage_engine;
+ERROR 42S02: Unknown table 'session' in field list
+SELECT default_storage_engine = @@session.default_storage_engine;
+ERROR 42S22: Unknown column 'default_storage_engine' in 'field list'
+SET @@default_storage_engine = @start_global_value;
+SET @@global.default_storage_engine = @start_global_value;
+SELECT @@global.default_storage_engine;
+@@global.default_storage_engine
+MyISAM
+SET @@session.default_storage_engine = @start_session_value;
+SELECT @@session.default_storage_engine;
+@@session.default_storage_engine
+MyISAM

mysql-test/suite/sys_vars/r/default_week_format_basic.result

@@ -113,7 +113,6 @@ Warning	1292	Truncated incorrect default_week_format value: '65550'
 SELECT @@session.default_week_format;
 @@session.default_week_format
 7
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 '#------------------FN_DYNVARS_022_06-----------------------#'
 SELECT @@global.default_week_format = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 

mysql-test/suite/sys_vars/r/delay_key_write_basic.result

@@ -5,12 +5,9 @@ ON
 '#--------------------FN_DYNVARS_023_01------------------------#'
 SET @@global.delay_key_write = OFF;
 SET @@global.delay_key_write = DEFAULT;
-ERROR 42000: Variable 'delay_key_write' doesn't have a default value
-'Bug # 34878: Documentation specifies a DEFAULT value of ON for variable but';
-'its not supported';
 SELECT @@global.delay_key_write;
 @@global.delay_key_write
-OFF
+ON
 '#---------------------FN_DYNVARS_023_02-------------------------#'
 SET @@global.delay_key_write = NULL;
 ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'NULL'
@@ -41,10 +38,7 @@ ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'FALSE0'
 SET @@global.delay_key_write = ONN;
 ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'ONN'
 SET @@global.delay_key_write = OF;
-SELECT @@global.delay_key_write;
-@@global.delay_key_write
-OFF
-'Bug# 34828: Variable is incorrectly accepting OF as a value'
+ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'OF'
 SET @@global.delay_key_write = ' ';
 ERROR 42000: Variable 'delay_key_write' can't be set to the value of ' '
 SET @@global.delay_key_write = "";

mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_32.result

@@ -45,7 +45,6 @@ Warning	1292	Truncated incorrect delayed_insert_limit value: '42949672950'
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 4294967295
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.delayed_insert_limit = 429496729.5;
 ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit'
 SELECT @@global.delayed_insert_limit;

mysql-test/suite/sys_vars/r/delayed_insert_limit_basic_64.result

@@ -43,7 +43,6 @@ SET @@global.delayed_insert_limit = 42949672950;
 SELECT @@global.delayed_insert_limit;
 @@global.delayed_insert_limit
 42949672950
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.delayed_insert_limit = 429496729.5;
 ERROR 42000: Incorrect argument type to variable 'delayed_insert_limit'
 SELECT @@global.delayed_insert_limit;

mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result

@@ -45,7 +45,6 @@ Warning	1292	Truncated incorrect delayed_insert_timeout value: '42949672950'
 SELECT @@global.delayed_insert_timeout;
 @@global.delayed_insert_timeout
 31536000
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.delayed_insert_timeout = 429496729.5;
 ERROR 42000: Incorrect argument type to variable 'delayed_insert_timeout'
 SELECT @@global.delayed_insert_timeout;

mysql-test/suite/sys_vars/r/delayed_queue_size_basic_32.result

@@ -45,7 +45,6 @@ Warning	1292	Truncated incorrect delayed_queue_size value: '42949672950'
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 4294967295
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.delayed_queue_size = 429496729.5;
 ERROR 42000: Incorrect argument type to variable 'delayed_queue_size'
 SELECT @@global.delayed_queue_size;

mysql-test/suite/sys_vars/r/delayed_queue_size_basic_64.result

@@ -43,7 +43,6 @@ SET @@global.delayed_queue_size = 42949672950;
 SELECT @@global.delayed_queue_size;
 @@global.delayed_queue_size
 42949672950
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.delayed_queue_size = 429496729.5;
 ERROR 42000: Incorrect argument type to variable 'delayed_queue_size'
 SELECT @@global.delayed_queue_size;

mysql-test/suite/sys_vars/r/div_precision_increment_basic.result

@@ -113,7 +113,6 @@ Warning	1292	Truncated incorrect div_precision_increment value: '65550'
 SELECT @@session.div_precision_increment;
 @@session.div_precision_increment
 30
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.div_precision_increment = 65530.30;
 ERROR 42000: Incorrect argument type to variable 'div_precision_increment'
 SELECT @@global.div_precision_increment;

mysql-test/suite/sys_vars/r/div_precision_increment_func.result

@@ -5,7 +5,7 @@ CREATE TABLE t1
 id INT NOT NULL auto_increment,
 PRIMARY KEY (id),
 name VARCHAR(30),
-salary LONG
+salary INT
 );
 '#--------------------FN_DYNVARS_027_01-------------------------#'
 ## Setting initial session value of variable to 3 ##
@@ -18,8 +18,7 @@ SELECT name, salary, ((salary * 2.5)/1000) AS INCOME from t1;
 name	salary	INCOME
 Record_1	100011	250.0275
 Record_2	501	1.2525
-Record_3	210	0.525
-'Bug#35374: div_precision is not working with table column'
+Record_3	210	0.5250
 ## Verifying variable's behavior with direct division ##
 SELECT 1/7;
 1/7
@@ -32,7 +31,7 @@ CREATE TABLE t1
 id INT NOT NULL auto_increment,
 PRIMARY KEY (id),
 name VARCHAR(30),
-salary LONG,
+salary INT,
 income_tax FLOAT
 );
 ## Creating new connection test_con1 ##

mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result

@@ -57,22 +57,19 @@ SELECT @@global.engine_condition_pushdown;
 SET @@session.engine_condition_pushdown = -1;
 ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '-1'
 SET @@session.engine_condition_pushdown = 1.6;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '2'
+ERROR 42000: Incorrect argument type to variable 'engine_condition_pushdown'
 SET @@session.engine_condition_pushdown = "T";
 ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'T'
 SET @@session.engine_condition_pushdown = "Y";
 ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'Y'
 SET @@session.engine_condition_pushdown = TR<54>E;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'TRÜE'
+ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'TR<EFBFBD>E'
 SET @@session.engine_condition_pushdown = <20>N;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'ÕN'
+ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '<EFBFBD>N'
 SET @@session.engine_condition_pushdown = OF;
-SELECT @@session.engine_condition_pushdown;
-@@session.engine_condition_pushdown
-0
-'Bug# 34828: OF is taken as OFF and a value of 0 is set.'
+ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'OF'
 SET @@session.engine_condition_pushdown = <20>FF;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'ÓFF'
+ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '<EFBFBD>FF'
 SET @@global.engine_condition_pushdown = -1;
 ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '-1'
 SET @@global.engine_condition_pushdown = 2;
@@ -82,16 +79,13 @@ ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '
 SET @@global.engine_condition_pushdown = "Y";
 ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'Y'
 SET @@global.engine_condition_pushdown = TR<54>E;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'TRÜE'
+ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'TR<EFBFBD>E'
 SET @@global.engine_condition_pushdown = <20>N;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'ÕN'
+ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '<EFBFBD>N'
 SET @@global.engine_condition_pushdown = OF;
-SELECT @@global.engine_condition_pushdown;
-@@global.engine_condition_pushdown
-0
-'Bug# 34828: OF is taken as OFF and a value of 0 is set.'
+ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'OF'
 SET @@global.engine_condition_pushdown = <20>FF;
-ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of 'ÓFF'
+ERROR 42000: Variable 'engine_condition_pushdown' can't be set to the value of '<EFBFBD>FF'
 '#-------------------FN_DYNVARS_028_05----------------------------#'
 SET @@global.engine_condition_pushdown = 0;
 SET @@session.engine_condition_pushdown = 1;

mysql-test/suite/sys_vars/r/event_scheduler_basic.result

@@ -4,8 +4,9 @@ SELECT @start_value;
 OFF
 '#---------------------FN_DYNVARS_004_01-------------------------#'
 SET @@global.event_scheduler = DEFAULT;
-ERROR 42000: Variable 'event_scheduler' doesn't have a default value
-'Bug# 34878: According to documentation the default value of variable is OFF';
+SELECT @@global.event_scheduler;
+@@global.event_scheduler
+OFF
 '#--------------------FN_DYNVARS_004_02------------------------#'
 SET @@global.event_scheduler = ON;
 SELECT @@global.event_scheduler;

mysql-test/suite/sys_vars/r/expire_logs_days_basic.result

@@ -66,7 +66,6 @@ Warning	1292	Truncated incorrect expire_logs_days value: '42949672950'
 SELECT @@global.expire_logs_days;
 @@global.expire_logs_days
 99
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.expire_logs_days = ON;
 ERROR 42000: Incorrect argument type to variable 'expire_logs_days'
 SELECT @@global.expire_logs_days;

mysql-test/suite/sys_vars/r/flush_basic.result

@@ -5,11 +5,9 @@ SELECT @start_value;
 '#--------------------FN_DYNVARS_030_01------------------------#'
 SET @@global.flush = ON;
 SET @@global.flush = DEFAULT;
-ERROR 42000: Variable 'flush' doesn't have a default value
-'Bug# 34878: FN_DYNVARS_002_01 - Default value is off according to Documentation of MySQL';
 SELECT @@global.flush;
 @@global.flush
-1
+0
 '#---------------------FN_DYNVARS_030_02-------------------------#'
 SET @@global.flush = @start_value;
 SELECT @@global.flush;

mysql-test/suite/sys_vars/r/flush_time_basic.result

@@ -0,0 +1,41 @@
+SET @start_global_value = @@global.flush_time;
+select @@global.flush_time;
+@@global.flush_time
+0
+select @@session.flush_time;
+ERROR HY000: Variable 'flush_time' is a GLOBAL variable
+show global variables like 'flush_time';
+Variable_name	Value
+flush_time	0
+show session variables like 'flush_time';
+Variable_name	Value
+flush_time	0
+select * from information_schema.global_variables where variable_name='flush_time';
+VARIABLE_NAME	VARIABLE_VALUE
+FLUSH_TIME	0
+select * from information_schema.session_variables where variable_name='flush_time';
+VARIABLE_NAME	VARIABLE_VALUE
+FLUSH_TIME	0
+set global flush_time=1;
+select @@global.flush_time;
+@@global.flush_time
+1
+set session flush_time=1;
+ERROR HY000: Variable 'flush_time' is a GLOBAL variable and should be set with SET GLOBAL
+set global flush_time=1.1;
+ERROR 42000: Incorrect argument type to variable 'flush_time'
+set global flush_time=1e1;
+ERROR 42000: Incorrect argument type to variable 'flush_time'
+set global flush_time="foo";
+ERROR 42000: Incorrect argument type to variable 'flush_time'
+set global flush_time=0;
+select @@global.flush_time;
+@@global.flush_time
+0
+set global flush_time=cast(-1 as unsigned int);
+Warnings:
+Warning	1292	Truncated incorrect flush_time value: '18446744073709551615'
+select @@global.flush_time;
+@@global.flush_time
+31536000
+SET @@global.flush_time = @start_global_value;

mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result

@@ -7,8 +7,7 @@ SET @@session.foreign_key_checks = 1;
 SET @@session.foreign_key_checks = DEFAULT;
 SELECT @@session.foreign_key_checks;
 @@session.foreign_key_checks
-1
-'Bug# 34878: No DEFAULT value for variable. Also setting DEFAULT does not give error'
+0
 '#---------------------FN_DYNVARS_032_02-------------------------#'
 SET foreign_key_checks = 1;
 SELECT @@foreign_key_checks;
@@ -41,25 +40,23 @@ ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'T'
 SET @@session.foreign_key_checks = "Y";
 ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'Y'
 SET @@session.foreign_key_checks = TR<54>E;
-ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'TRÜE'
+ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'TR<EFBFBD>E'
 SET @@session.foreign_key_checks = <20>N;
-ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'ÕN'
+ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of '<EFBFBD>N'
 SET @@session.foreign_key_checks = OF;
-SELECT @@session.foreign_key_checks;
-@@session.foreign_key_checks
-0
-'Bug# 34828: OF is taken as OFF and a value of 0 is set.'
+ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'OF'
 SET @@session.foreign_key_checks = <20>FF;
-ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'ÓFF'
+ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of '<EFBFBD>FF'
 SET @@session.foreign_key_checks = '<27>';
 ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of '<27>'
 SET @@session.foreign_key_checks = NO;
 ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'NO'
 '#-------------------FN_DYNVARS_032_05----------------------------#'
 SET @@global.foreign_key_checks = 0;
-ERROR HY000: Variable 'foreign_key_checks' is a SESSION variable and can't be used with SET GLOBAL
 SELECT @@global.foreign_key_checks;
-ERROR HY000: Variable 'foreign_key_checks' is a SESSION variable
+@@global.foreign_key_checks
+0
+SET @@global.foreign_key_checks = 1;
 '#----------------------FN_DYNVARS_032_06------------------------#'
 SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='foreign_key_checks';
 count(VARIABLE_VALUE)
@@ -72,12 +69,12 @@ IF(@@session.foreign_key_checks, "ON", "OFF") = VARIABLE_VALUE
 1
 SELECT @@session.foreign_key_checks;
 @@session.foreign_key_checks
-0
+1
 SELECT VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
 WHERE VARIABLE_NAME='foreign_key_checks';
 VARIABLE_VALUE
-OFF
+ON
 '#---------------------FN_DYNVARS_032_08-------------------------#'
 SET @@session.foreign_key_checks = OFF;
 SELECT @@session.foreign_key_checks;

mysql-test/suite/sys_vars/r/foreign_key_checks_func.result

@@ -36,9 +36,6 @@ INSERT INTO t2 values (20,4);
 'try enabling foreign_key_checks again';
 SET @@session.foreign_key_checks = 1;
 UPDATE t2 SET b=4 where a=20;
-'Bug#35358: Updating an incorrect foreign key(inserted by disabling '
-'foreign_key_checks)to the same value does not raise error after '
-'enabling foreign_key_checks'
 'Check when foreign_key_checks is enabled and FK constraint is re-created'
 SET @@session.foreign_key_checks = 0;
 TRUNCATE t2;

mysql-test/suite/sys_vars/r/ft_boolean_syntax_basic.result

@@ -93,9 +93,6 @@ SELECT @global_start_value;
 @global_start_value
 + -><()~*:""&|
 SET @@global.ft_boolean_syntax = @global_start_value;
-ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of ''
-'Bug# 34883: ft_boolean_syntax cant be assigned values from session temporary';
-'variables';
 SET @@global.ft_boolean_syntax = DEFAULT;
 SELECT @@global.ft_boolean_syntax;
 @@global.ft_boolean_syntax

mysql-test/suite/sys_vars/r/ft_boolean_syntax_func.result

@@ -70,20 +70,20 @@ FROM articles WHERE MATCH (title,body)
 AGAINST ('+security configuring' IN BOOLEAN MODE);
 id	title	body	relevance
 8	MySQL Security	When configured properly, MySQL ...	1
-9	Database Security	Configuring MySQL for ...	1.33333337306976
+9	Database Security	Configuring MySQL for ...	1.3333333730697632
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('"faster than"' IN BOOLEAN MODE);
 id	title	body
 6	100 Tips for Myisam	1. Myisam is faster than innodb 2. Tricks and Tips for Myisam...
 SELECT * FROM articles WHERE MATCH (title,body)
-AGAINST ('+run ~line' IN BOOLEAN MODE);
+AGAINST ('+tutorial ~line' IN BOOLEAN MODE);
 id	title	body
-'Bug#35359: ~ is not working correctly. Its behaving like -'
+1	MySQL Tutorial	DBMS stands for DataBase ...
+4	Optimizing MySQL	In this tutorial we will show .... Run command line ...
 SELECT * FROM articles WHERE MATCH (title,body)
 AGAINST ('10*' IN BOOLEAN MODE);
 id	title	body
 5	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
-'Bug#35360: * is not working correctly. Not all rows are returned'
 SELECT id,title,body, (MATCH (title,body) 
 AGAINST ('+MySQL +(>show <dbms)' IN BOOLEAN MODE)) AS relevance
 FROM articles WHERE MATCH (title,body) 
@@ -91,7 +91,7 @@ AGAINST ('+MySQL +(>show <dbms)' IN BOOLEAN MODE)
 ORDER BY relevance DESC;
 id	title	body	relevance
 4	Optimizing MySQL	In this tutorial we will show .... Run command line ...	1.25
-1	MySQL Tutorial	DBMS stands for DataBase ...	0.833333373069763
+1	MySQL Tutorial	DBMS stands for DataBase ...	0.8333333730697632
 '---try setting different operators. Default '+ -><()~*:""&|'--'
 SET @@global.ft_boolean_syntax='~ /!@#$%^&*()-';
 SELECT * FROM articles WHERE MATCH (title,body)
@@ -103,6 +103,5 @@ id	title	body
 5	1001 MySQL Tricks	1. Never run mysqld as root. 2. ...
 8	MySQL Security	When configured properly, MySQL ...
 9	Database Security	Configuring MySQL for ...
-'Bug#35361: Different syntax does not produce result as default operators'
 SET @@global.ft_boolean_syntax=DEFAULT;
 DROP TABLE articles;

mysql-test/suite/sys_vars/r/ft_max_word_len_basic.result

@@ -0,0 +1,21 @@
+select @@global.ft_max_word_len;
+@@global.ft_max_word_len
+84
+select @@session.ft_max_word_len;
+ERROR HY000: Variable 'ft_max_word_len' is a GLOBAL variable
+show global variables like 'ft_max_word_len';
+Variable_name	Value
+ft_max_word_len	84
+show session variables like 'ft_max_word_len';
+Variable_name	Value
+ft_max_word_len	84
+select * from information_schema.global_variables where variable_name='ft_max_word_len';
+VARIABLE_NAME	VARIABLE_VALUE
+FT_MAX_WORD_LEN	84
+select * from information_schema.session_variables where variable_name='ft_max_word_len';
+VARIABLE_NAME	VARIABLE_VALUE
+FT_MAX_WORD_LEN	84
+set global ft_max_word_len=1;
+ERROR HY000: Variable 'ft_max_word_len' is a read only variable
+set session ft_max_word_len=1;
+ERROR HY000: Variable 'ft_max_word_len' is a read only variable

mysql-test/suite/sys_vars/r/ft_min_word_len_basic.result

@@ -0,0 +1,21 @@
+select @@global.ft_min_word_len;
+@@global.ft_min_word_len
+4
+select @@session.ft_min_word_len;
+ERROR HY000: Variable 'ft_min_word_len' is a GLOBAL variable
+show global variables like 'ft_min_word_len';
+Variable_name	Value
+ft_min_word_len	4
+show session variables like 'ft_min_word_len';
+Variable_name	Value
+ft_min_word_len	4
+select * from information_schema.global_variables where variable_name='ft_min_word_len';
+VARIABLE_NAME	VARIABLE_VALUE
+FT_MIN_WORD_LEN	4
+select * from information_schema.session_variables where variable_name='ft_min_word_len';
+VARIABLE_NAME	VARIABLE_VALUE
+FT_MIN_WORD_LEN	4
+set global ft_min_word_len=1;
+ERROR HY000: Variable 'ft_min_word_len' is a read only variable
+set session ft_min_word_len=1;
+ERROR HY000: Variable 'ft_min_word_len' is a read only variable

mysql-test/suite/sys_vars/r/ft_query_expansion_limit_basic.result

@@ -0,0 +1,21 @@
+select @@global.ft_query_expansion_limit;
+@@global.ft_query_expansion_limit
+20
+select @@session.ft_query_expansion_limit;
+ERROR HY000: Variable 'ft_query_expansion_limit' is a GLOBAL variable
+show global variables like 'ft_query_expansion_limit';
+Variable_name	Value
+ft_query_expansion_limit	20
+show session variables like 'ft_query_expansion_limit';
+Variable_name	Value
+ft_query_expansion_limit	20
+select * from information_schema.global_variables where variable_name='ft_query_expansion_limit';
+VARIABLE_NAME	VARIABLE_VALUE
+FT_QUERY_EXPANSION_LIMIT	20
+select * from information_schema.session_variables where variable_name='ft_query_expansion_limit';
+VARIABLE_NAME	VARIABLE_VALUE
+FT_QUERY_EXPANSION_LIMIT	20
+set global ft_query_expansion_limit=1;
+ERROR HY000: Variable 'ft_query_expansion_limit' is a read only variable
+set session ft_query_expansion_limit=1;
+ERROR HY000: Variable 'ft_query_expansion_limit' is a read only variable

mysql-test/suite/sys_vars/r/ft_stopword_file_basic.result

@@ -0,0 +1,21 @@
+select @@global.ft_stopword_file;
+@@global.ft_stopword_file
+(built-in)
+select @@session.ft_stopword_file;
+ERROR HY000: Variable 'ft_stopword_file' is a GLOBAL variable
+show global variables like 'ft_stopword_file';
+Variable_name	Value
+ft_stopword_file	(built-in)
+show session variables like 'ft_stopword_file';
+Variable_name	Value
+ft_stopword_file	(built-in)
+select * from information_schema.global_variables where variable_name='ft_stopword_file';
+VARIABLE_NAME	VARIABLE_VALUE
+FT_STOPWORD_FILE	(built-in)
+select * from information_schema.session_variables where variable_name='ft_stopword_file';
+VARIABLE_NAME	VARIABLE_VALUE
+FT_STOPWORD_FILE	(built-in)
+set global ft_stopword_file=1;
+ERROR HY000: Variable 'ft_stopword_file' is a read only variable
+set session ft_stopword_file=1;
+ERROR HY000: Variable 'ft_stopword_file' is a read only variable

mysql-test/suite/sys_vars/r/general_log_file_basic.result

@@ -4,9 +4,10 @@ SELECT @start_value;
 test.log
 '#---------------------FN_DYNVARS_004_01-------------------------#'
 SET @@global.general_log_file = DEFAULT;
-SELECT RIGHT(@@global.general_log_file,10) AS log_file;
-log_file
-mysqld.log
+SET @a=concat(left(@@hostname, instr(concat(@@hostname, '.'), '.')-1), '.log');
+SELECT RIGHT(@@global.general_log_file, length(@a)) = @a;
+RIGHT(@@global.general_log_file, length(@a)) = @a
+1
 '#--------------------FN_DYNVARS_004_02------------------------#'
 SET @@global.general_log_file = mytest.log;
 SET @@global.general_log_file = 12;

mysql-test/suite/sys_vars/r/general_log_func.result

@@ -12,6 +12,10 @@ SET @@global.general_log = OFF;
 SELECT @@general_log;
 @@general_log
 0
+flush logs;
+SET @@global.general_log = ON;
+flush logs;
+SET @@global.general_log = OFF;
 ## Inserting some Records & Verifying output in log ##
 INSERT into t1(name) values('Record_1');
 INSERT into t1(name) values('Record_2');
@@ -25,12 +29,11 @@ SELECT @@general_log;
 ## Inserting some Records & Verifying output in log ##
 INSERT into t1(name) values('Record_3');
 INSERT into t1(name) values('Record_4');
-## There should be a difference ##
-SET @@global.max_allowed_packet= 1024*1024*1024;
+## old log is a proper prefix of the new log ##
 SET @orig_file= load_file('MYSQLD_LOGFILE.orig');
 SET @copy_file= load_file('MYSQLD_LOGFILE.copy');
-SELECT STRCMP(@orig_file, @copy_file);
-STRCMP(@orig_file, @copy_file)
-1
+SELECT @orig_file > @copy_file, left(@orig_file, length(@copy_file)) = @copy_file;
+@orig_file > @copy_file	left(@orig_file, length(@copy_file)) = @copy_file
+1	1
 ## Dropping tables ##
 DROP TABLE t1;

mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result

@@ -73,8 +73,8 @@ SET @@global.group_concat_max_len = 65536;
 SELECT @@global.group_concat_max_len;
 @@global.group_concat_max_len
 65536
-SET @@global.group_concat_max_len = 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
+SET @@global.group_concat_max_len = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'group_concat_max_len'
 SELECT @@global.group_concat_max_len;
 @@global.group_concat_max_len
 65536
@@ -95,13 +95,12 @@ Warning	1292	Truncated incorrect group_concat_max_len value: '-2'
 SELECT @@session.group_concat_max_len;
 @@session.group_concat_max_len
 4
-SET @@session.group_concat_max_len = 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
+SET @@session.group_concat_max_len = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'group_concat_max_len'
 SET @@session.group_concat_max_len = 65550;
 SELECT @@session.group_concat_max_len;
 @@session.group_concat_max_len
 65550
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@session.group_concat_max_len = test;
 ERROR 42000: Incorrect argument type to variable 'group_concat_max_len'
 SELECT @@session.group_concat_max_len;

mysql-test/suite/sys_vars/r/have_profiling_basic.result

@@ -0,0 +1,21 @@
+select @@global.have_profiling="1";
+@@global.have_profiling="1"
+0
+select @@session.have_profiling;
+ERROR HY000: Variable 'have_profiling' is a GLOBAL variable
+show global variables like 'have_profiling';
+Variable_name	Value
+have_profiling	#
+show session variables like 'have_profiling';
+Variable_name	Value
+have_profiling	#
+select * from information_schema.global_variables where variable_name='have_profiling';
+VARIABLE_NAME	VARIABLE_VALUE
+HAVE_PROFILING	#
+select * from information_schema.session_variables where variable_name='have_profiling';
+VARIABLE_NAME	VARIABLE_VALUE
+HAVE_PROFILING	#
+set global have_profiling=1;
+ERROR HY000: Variable 'have_profiling' is a read only variable
+set session have_profiling=1;
+ERROR HY000: Variable 'have_profiling' is a read only variable

mysql-test/suite/sys_vars/r/identity_basic.result

@@ -32,9 +32,11 @@ SELECT @@session.identity;
 65535
 '#--------------------FN_DYNVARS_035_04-------------------------#'
 SET @@session.identity = -1;
+Warnings:
+Warning	1292	Truncated incorrect identity value: '-1'
 SELECT @@session.identity;
 @@session.identity
--1
+0
 SET @@session.identity = 100000000000;
 SELECT @@session.identity;
 @@session.identity
@@ -45,14 +47,15 @@ SELECT @@session.identity;
 @@session.identity
 100000000000
 SET @@session.identity = -1024;
+Warnings:
+Warning	1292	Truncated incorrect identity value: '-1024'
 SELECT @@session.identity;
 @@session.identity
--1024
+0
 SET @@session.identity = 42949672950;
 SELECT @@session.identity;
 @@session.identity
 42949672950
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@session.identity = ON;
 ERROR 42000: Incorrect argument type to variable 'identity'
 SELECT @@session.identity;

mysql-test/suite/sys_vars/r/ignore_builtin_innodb_basic.result

@@ -0,0 +1,21 @@
+select @@global.ignore_builtin_innodb;
+@@global.ignore_builtin_innodb
+0
+select @@session.ignore_builtin_innodb;
+ERROR HY000: Variable 'ignore_builtin_innodb' is a GLOBAL variable
+show global variables like 'ignore_builtin_innodb';
+Variable_name	Value
+ignore_builtin_innodb	OFF
+show session variables like 'ignore_builtin_innodb';
+Variable_name	Value
+ignore_builtin_innodb	OFF
+select * from information_schema.global_variables where variable_name='ignore_builtin_innodb';
+VARIABLE_NAME	VARIABLE_VALUE
+IGNORE_BUILTIN_INNODB	OFF
+select * from information_schema.session_variables where variable_name='ignore_builtin_innodb';
+VARIABLE_NAME	VARIABLE_VALUE
+IGNORE_BUILTIN_INNODB	OFF
+set global ignore_builtin_innodb=1;
+ERROR HY000: Variable 'ignore_builtin_innodb' is a read only variable
+set session ignore_builtin_innodb=1;
+ERROR HY000: Variable 'ignore_builtin_innodb' is a read only variable

mysql-test/suite/sys_vars/r/init_file_basic.result

@@ -0,0 +1,21 @@
+select @@global.init_file;
+@@global.init_file
+NULL
+select @@session.init_file;
+ERROR HY000: Variable 'init_file' is a GLOBAL variable
+show global variables like 'init_file';
+Variable_name	Value
+init_file	
+show session variables like 'init_file';
+Variable_name	Value
+init_file	
+select * from information_schema.global_variables where variable_name='init_file';
+VARIABLE_NAME	VARIABLE_VALUE
+INIT_FILE	
+select * from information_schema.session_variables where variable_name='init_file';
+VARIABLE_NAME	VARIABLE_VALUE
+INIT_FILE	
+set global init_file=1;
+ERROR HY000: Variable 'init_file' is a read only variable
+set session init_file=1;
+ERROR HY000: Variable 'init_file' is a read only variable

mysql-test/suite/sys_vars/r/innodb_autoextend_increment_basic.result

@@ -2,22 +2,22 @@ SET @global_start_value = @@global.innodb_autoextend_increment ;
 '#--------------------FN_DYNVARS_046_01------------------------#'
 SET @@global.innodb_autoextend_increment  = 0;
 Warnings:
-Warning	1292	Truncated incorrect autoextend_increment value: '0'
+Warning	1292	Truncated incorrect innodb_autoextend_increment value: '0'
 SET @@global.innodb_autoextend_increment  = DEFAULT;
 SELECT @@global.innodb_autoextend_increment ;
 @@global.innodb_autoextend_increment
-64
+8
 '#---------------------FN_DYNVARS_046_02-------------------------#'
 SET innodb_autoextend_increment  = 1;
 ERROR HY000: Variable 'innodb_autoextend_increment' is a GLOBAL variable and should be set with SET GLOBAL
 SELECT @@innodb_autoextend_increment ;
 @@innodb_autoextend_increment
-64
+8
 SELECT local.innodb_autoextend_increment ;
 ERROR 42S02: Unknown table 'local' in field list
 SET global innodb_autoextend_increment  = 0;
 Warnings:
-Warning	1292	Truncated incorrect autoextend_increment value: '0'
+Warning	1292	Truncated incorrect innodb_autoextend_increment value: '0'
 SELECT @@global.innodb_autoextend_increment ;
 @@global.innodb_autoextend_increment
 1
@@ -33,23 +33,23 @@ SELECT @@global.innodb_autoextend_increment ;
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@global.innodb_autoextend_increment  = -1;
 Warnings:
-Warning	1292	Truncated incorrect autoextend_increment value: '18446744073709551615'
+Warning	1292	Truncated incorrect innodb_autoextend_increment value: '-1'
 SELECT @@global.innodb_autoextend_increment;
 @@global.innodb_autoextend_increment
-1000
+1
 SET @@global.innodb_autoextend_increment  = "T";
 ERROR 42000: Incorrect argument type to variable 'innodb_autoextend_increment'
 SELECT @@global.innodb_autoextend_increment;
 @@global.innodb_autoextend_increment
-1000
+1
 SET @@global.innodb_autoextend_increment  = "Y";
 ERROR 42000: Incorrect argument type to variable 'innodb_autoextend_increment'
 SELECT @@global.innodb_autoextend_increment;
 @@global.innodb_autoextend_increment
-1000
+1
 SET @@global.innodb_autoextend_increment  = 1001;
 Warnings:
-Warning	1292	Truncated incorrect autoextend_increment value: '1001'
+Warning	1292	Truncated incorrect innodb_autoextend_increment value: '1001'
 SELECT @@global.innodb_autoextend_increment;
 @@global.innodb_autoextend_increment
 1000
@@ -85,7 +85,7 @@ SELECT @@global.innodb_autoextend_increment ;
 1
 SET @@global.innodb_autoextend_increment  = FALSE;
 Warnings:
-Warning	1292	Truncated incorrect autoextend_increment value: '0'
+Warning	1292	Truncated incorrect innodb_autoextend_increment value: '0'
 SELECT @@global.innodb_autoextend_increment ;
 @@global.innodb_autoextend_increment
 1

mysql-test/suite/sys_vars/r/innodb_commit_concurrency_basic.result

@@ -25,37 +25,17 @@ SET @@global.innodb_commit_concurrency = 0;
 SELECT @@global.innodb_commit_concurrency;
 @@global.innodb_commit_concurrency
 0
-SET @@global.innodb_commit_concurrency = 1;
-SELECT @@global.innodb_commit_concurrency;
-@@global.innodb_commit_concurrency
-1
-SET @@global.innodb_commit_concurrency = 1000;
-SELECT @@global.innodb_commit_concurrency;
-@@global.innodb_commit_concurrency
-1000
 '#--------------------FN_DYNVARS_046_04-------------------------#'
+SET @@global.innodb_commit_concurrency = 1;
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '1'
 SET @@global.innodb_commit_concurrency = -1;
-Warnings:
-Warning	1292	Truncated incorrect commit_concurrency value: '18446744073709551615'
-SELECT @@global.innodb_commit_concurrency;
-@@global.innodb_commit_concurrency
-1000
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '-1'
 SET @@global.innodb_commit_concurrency = "T";
 ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency'
-SELECT @@global.innodb_commit_concurrency;
-@@global.innodb_commit_concurrency
-1000
 SET @@global.innodb_commit_concurrency = "Y";
 ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency'
-SELECT @@global.innodb_commit_concurrency;
-@@global.innodb_commit_concurrency
-1000
 SET @@global.innodb_commit_concurrency = 1001;
-Warnings:
-Warning	1292	Truncated incorrect commit_concurrency value: '1001'
-SELECT @@global.innodb_commit_concurrency;
-@@global.innodb_commit_concurrency
-1000
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '1001'
 '#----------------------FN_DYNVARS_046_05------------------------#'
 SELECT @@global.innodb_commit_concurrency =
 VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -65,30 +45,21 @@ VARIABLE_VALUE
 1
 SELECT @@global.innodb_commit_concurrency;
 @@global.innodb_commit_concurrency
-1000
+0
 SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 WHERE VARIABLE_NAME='innodb_commit_concurrency';
 VARIABLE_VALUE
-1000
+0
 '#---------------------FN_DYNVARS_046_06-------------------------#'
 SET @@global.innodb_commit_concurrency = OFF;
 ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency'
 SELECT @@global.innodb_commit_concurrency;
 @@global.innodb_commit_concurrency
-1000
+0
 SET @@global.innodb_commit_concurrency = ON;
 ERROR 42000: Incorrect argument type to variable 'innodb_commit_concurrency'
 SELECT @@global.innodb_commit_concurrency;
 @@global.innodb_commit_concurrency
-1000
-'#---------------------FN_DYNVARS_046_07----------------------#'
-SET @@global.innodb_commit_concurrency = TRUE;
-SELECT @@global.innodb_commit_concurrency;
-@@global.innodb_commit_concurrency
-1
-SET @@global.innodb_commit_concurrency = FALSE;
-SELECT @@global.innodb_commit_concurrency;
-@@global.innodb_commit_concurrency
 0
 SET @@global.innodb_commit_concurrency = @global_start_value;
 SELECT @@global.innodb_commit_concurrency;

mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic.result

@@ -5,7 +5,7 @@ SELECT @global_start_value;
 '#--------------------FN_DYNVARS_046_01------------------------#'
 SET @@global.innodb_concurrency_tickets = 0;
 Warnings:
-Warning	1292	Truncated incorrect concurrency_tickets value: '0'
+Warning	1292	Truncated incorrect innodb_concurrency_tickets value: '0'
 SET @@global.innodb_concurrency_tickets = DEFAULT;
 SELECT @@global.innodb_concurrency_tickets;
 @@global.innodb_concurrency_tickets
@@ -20,7 +20,7 @@ SELECT local.innodb_concurrency_tickets;
 ERROR 42S02: Unknown table 'local' in field list
 SET global innodb_concurrency_tickets = 0;
 Warnings:
-Warning	1292	Truncated incorrect concurrency_tickets value: '0'
+Warning	1292	Truncated incorrect innodb_concurrency_tickets value: '0'
 SELECT @@global.innodb_concurrency_tickets;
 @@global.innodb_concurrency_tickets
 1
@@ -39,19 +39,21 @@ SELECT @@global.innodb_concurrency_tickets;
 4294967295
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@global.innodb_concurrency_tickets = -1;
+Warnings:
+Warning	1292	Truncated incorrect innodb_concurrency_tickets value: '-1'
 SELECT @@global.innodb_concurrency_tickets;
 @@global.innodb_concurrency_tickets
-18446744073709551615
+1
 SET @@global.innodb_concurrency_tickets = "T";
 ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets'
 SELECT @@global.innodb_concurrency_tickets;
 @@global.innodb_concurrency_tickets
-18446744073709551615
+1
 SET @@global.innodb_concurrency_tickets = "Y";
 ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets'
 SELECT @@global.innodb_concurrency_tickets;
 @@global.innodb_concurrency_tickets
-18446744073709551615
+1
 SET @@global.innodb_concurrency_tickets = 1001;
 SELECT @@global.innodb_concurrency_tickets;
 @@global.innodb_concurrency_tickets
@@ -88,7 +90,7 @@ SELECT @@global.innodb_concurrency_tickets;
 1
 SET @@global.innodb_concurrency_tickets = FALSE;
 Warnings:
-Warning	1292	Truncated incorrect concurrency_tickets value: '0'
+Warning	1292	Truncated incorrect innodb_concurrency_tickets value: '0'
 SELECT @@global.innodb_concurrency_tickets;
 @@global.innodb_concurrency_tickets
 1

mysql-test/suite/sys_vars/r/innodb_concurrency_tickets_basic_32.result

@@ -1,100 +0,0 @@
-SET @global_start_value = @@global.innodb_concurrency_tickets;
-SELECT @global_start_value;
-@global_start_value
-500
-'#--------------------FN_DYNVARS_046_01------------------------#'
-SET @@global.innodb_concurrency_tickets = 0;
-Warnings:
-Warning	1292	Truncated incorrect concurrency_tickets value: '0'
-SET @@global.innodb_concurrency_tickets = DEFAULT;
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-500
-'#---------------------FN_DYNVARS_046_02-------------------------#'
-SET innodb_concurrency_tickets = 1;
-ERROR HY000: Variable 'innodb_concurrency_tickets' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@innodb_concurrency_tickets;
-@@innodb_concurrency_tickets
-500
-SELECT local.innodb_concurrency_tickets;
-ERROR 42S02: Unknown table 'local' in field list
-SET global innodb_concurrency_tickets = 0;
-Warnings:
-Warning	1292	Truncated incorrect concurrency_tickets value: '0'
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1
-'#--------------------FN_DYNVARS_046_03------------------------#'
-SET @@global.innodb_concurrency_tickets = 1;
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1
-SET @@global.innodb_concurrency_tickets = 1000;
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1000
-SET @@global.innodb_concurrency_tickets = 4294967295;
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-4294967295
-'#--------------------FN_DYNVARS_046_04-------------------------#'
-SET @@global.innodb_concurrency_tickets = -1;
-Warnings:
-Warning	1292	Truncated incorrect concurrency_tickets value: '18446744073709551615'
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-4294967295
-SET @@global.innodb_concurrency_tickets = "T";
-ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets'
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-4294967295
-SET @@global.innodb_concurrency_tickets = "Y";
-ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets'
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-4294967295
-SET @@global.innodb_concurrency_tickets = 1001;
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1001
-'#----------------------FN_DYNVARS_046_05------------------------#'
-SELECT @@global.innodb_concurrency_tickets =
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_concurrency_tickets';
-@@global.innodb_concurrency_tickets =
-VARIABLE_VALUE
-1
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1001
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_concurrency_tickets';
-VARIABLE_VALUE
-1001
-'#---------------------FN_DYNVARS_046_06-------------------------#'
-SET @@global.innodb_concurrency_tickets = OFF;
-ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets'
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1001
-SET @@global.innodb_concurrency_tickets = ON;
-ERROR 42000: Incorrect argument type to variable 'innodb_concurrency_tickets'
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1001
-'#---------------------FN_DYNVARS_046_07----------------------#'
-SET @@global.innodb_concurrency_tickets = TRUE;
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1
-SET @@global.innodb_concurrency_tickets = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect concurrency_tickets value: '0'
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-1
-SET @@global.innodb_concurrency_tickets = @global_start_value;
-SELECT @@global.innodb_concurrency_tickets;
-@@global.innodb_concurrency_tickets
-500

mysql-test/suite/sys_vars/r/innodb_fast_shutdown_basic.result

@@ -36,55 +36,55 @@ SELECT @@global.innodb_fast_shutdown;
 '#--------------------FN_DYNVARS_042_04-------------------------#'
 SET @@global.innodb_fast_shutdown = -1;
 Warnings:
-Warning	1292	Truncated incorrect fast_shutdown value: '18446744073709551615'
+Warning	1292	Truncated incorrect innodb_fast_shutdown value: '-1'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = TRU;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = TRUE_F;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = FALS;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = OON;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = ONN;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = OOFF;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = 0FF;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = '1';
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = "0";
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 '#-------------------FN_DYNVARS_042_05----------------------------#'
 SET @@session.innodb_fast_shutdown = 0;
 ERROR HY000: Variable 'innodb_fast_shutdown' is a GLOBAL variable and should be set with SET GLOBAL
@@ -110,12 +110,12 @@ SET @@global.innodb_fast_shutdown = OFF;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 SET @@global.innodb_fast_shutdown = ON;
 ERROR 42000: Incorrect argument type to variable 'innodb_fast_shutdown'
 SELECT @@global.innodb_fast_shutdown;
 @@global.innodb_fast_shutdown
-2
+0
 '#---------------------FN_DYNVARS_042_09----------------------#'
 SET @@global.innodb_fast_shutdown = TRUE;
 SELECT @@global.innodb_fast_shutdown;

mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result

@@ -36,23 +36,23 @@ SELECT @@global.innodb_flush_log_at_trx_commit;
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@global.innodb_flush_log_at_trx_commit = -1;
 Warnings:
-Warning	1292	Truncated incorrect flush_log_at_trx_commit value: '18446744073709551615'
+Warning	1292	Truncated incorrect innodb_flush_log_at_trx_commit value: '-1'
 SELECT @@global.innodb_flush_log_at_trx_commit;
 @@global.innodb_flush_log_at_trx_commit
-2
+0
 SET @@global.innodb_flush_log_at_trx_commit = "T";
 ERROR 42000: Incorrect argument type to variable 'innodb_flush_log_at_trx_commit'
 SELECT @@global.innodb_flush_log_at_trx_commit;
 @@global.innodb_flush_log_at_trx_commit
-2
+0
 SET @@global.innodb_flush_log_at_trx_commit = "Y";
 ERROR 42000: Incorrect argument type to variable 'innodb_flush_log_at_trx_commit'
 SELECT @@global.innodb_flush_log_at_trx_commit;
 @@global.innodb_flush_log_at_trx_commit
-2
+0
 SET @@global.innodb_flush_log_at_trx_commit = 1001;
 Warnings:
-Warning	1292	Truncated incorrect flush_log_at_trx_commit value: '1001'
+Warning	1292	Truncated incorrect innodb_flush_log_at_trx_commit value: '1001'
 SELECT @@global.innodb_flush_log_at_trx_commit;
 @@global.innodb_flush_log_at_trx_commit
 2

mysql-test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result

@@ -36,23 +36,23 @@ SELECT @@global.innodb_max_dirty_pages_pct;
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@global.innodb_max_dirty_pages_pct = -1;
 Warnings:
-Warning	1292	Truncated incorrect max_dirty_pages_pct value: '18446744073709551615'
+Warning	1292	Truncated incorrect innodb_max_dirty_pages_pct value: '-1'
 SELECT @@global.innodb_max_dirty_pages_pct;
 @@global.innodb_max_dirty_pages_pct
-99
+0
 SET @@global.innodb_max_dirty_pages_pct = "T";
 ERROR 42000: Incorrect argument type to variable 'innodb_max_dirty_pages_pct'
 SELECT @@global.innodb_max_dirty_pages_pct;
 @@global.innodb_max_dirty_pages_pct
-99
+0
 SET @@global.innodb_max_dirty_pages_pct = "Y";
 ERROR 42000: Incorrect argument type to variable 'innodb_max_dirty_pages_pct'
 SELECT @@global.innodb_max_dirty_pages_pct;
 @@global.innodb_max_dirty_pages_pct
-99
+0
 SET @@global.innodb_max_dirty_pages_pct = 1001;
 Warnings:
-Warning	1292	Truncated incorrect max_dirty_pages_pct value: '1001'
+Warning	1292	Truncated incorrect innodb_max_dirty_pages_pct value: '1001'
 SELECT @@global.innodb_max_dirty_pages_pct;
 @@global.innodb_max_dirty_pages_pct
 99

mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic.result

@@ -35,19 +35,21 @@ SELECT @@global.innodb_max_purge_lag;
 4294967295
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@global.innodb_max_purge_lag = -1;
+Warnings:
+Warning	1292	Truncated incorrect innodb_max_purge_lag value: '-1'
 SELECT @@global.innodb_max_purge_lag;
 @@global.innodb_max_purge_lag
-18446744073709551615
+0
 SET @@global.innodb_max_purge_lag = "T";
 ERROR 42000: Incorrect argument type to variable 'innodb_max_purge_lag'
 SELECT @@global.innodb_max_purge_lag;
 @@global.innodb_max_purge_lag
-18446744073709551615
+0
 SET @@global.innodb_max_purge_lag = "Y";
 ERROR 42000: Incorrect argument type to variable 'innodb_max_purge_lag'
 SELECT @@global.innodb_max_purge_lag;
 @@global.innodb_max_purge_lag
-18446744073709551615
+0
 SET @@global.innodb_max_purge_lag = 1001;
 SELECT @@global.innodb_max_purge_lag;
 @@global.innodb_max_purge_lag

mysql-test/suite/sys_vars/r/innodb_max_purge_lag_basic_32.result

@@ -1,94 +0,0 @@
-SET @global_start_value = @@global.innodb_max_purge_lag;
-SELECT @global_start_value;
-@global_start_value
-0
-'#--------------------FN_DYNVARS_046_01------------------------#'
-SET @@global.innodb_max_purge_lag = 0;
-SET @@global.innodb_max_purge_lag = DEFAULT;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-0
-'#---------------------FN_DYNVARS_046_02-------------------------#'
-SET innodb_max_purge_lag = 1;
-ERROR HY000: Variable 'innodb_max_purge_lag' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@innodb_max_purge_lag;
-@@innodb_max_purge_lag
-0
-SELECT local.innodb_max_purge_lag;
-ERROR 42S02: Unknown table 'local' in field list
-SET global innodb_max_purge_lag = 0;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-0
-'#--------------------FN_DYNVARS_046_03------------------------#'
-SET @@global.innodb_max_purge_lag = 0;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-0
-SET @@global.innodb_max_purge_lag = 1;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-1
-SET @@global.innodb_max_purge_lag = 4294967295;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-4294967295
-'#--------------------FN_DYNVARS_046_04-------------------------#'
-SET @@global.innodb_max_purge_lag = -1;
-Warnings:
-Warning	1292	Truncated incorrect max_purge_lag value: '18446744073709551615'
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-4294967295
-SET @@global.innodb_max_purge_lag = "T";
-ERROR 42000: Incorrect argument type to variable 'innodb_max_purge_lag'
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-4294967295
-SET @@global.innodb_max_purge_lag = "Y";
-ERROR 42000: Incorrect argument type to variable 'innodb_max_purge_lag'
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-4294967295
-SET @@global.innodb_max_purge_lag = 1001;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-1001
-'#----------------------FN_DYNVARS_046_05------------------------#'
-SELECT @@global.innodb_max_purge_lag =
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_max_purge_lag';
-@@global.innodb_max_purge_lag =
-VARIABLE_VALUE
-1
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-1001
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_max_purge_lag';
-VARIABLE_VALUE
-1001
-'#---------------------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
-1001
-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
-1001
-'#---------------------FN_DYNVARS_046_07----------------------#'
-SET @@global.innodb_max_purge_lag = TRUE;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-1
-SET @@global.innodb_max_purge_lag = FALSE;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-0
-SET @@global.innodb_max_purge_lag = @global_start_value;
-SELECT @@global.innodb_max_purge_lag;
-@@global.innodb_max_purge_lag
-0

mysql-test/suite/sys_vars/r/innodb_support_xa_basic.result

@@ -55,45 +55,43 @@ SELECT @@global.innodb_support_xa;
 1
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@session.innodb_support_xa = -0.6;
-ERROR 42000: Variable 'support_xa' can't be set to the value of '-0.6'
+ERROR 42000: Incorrect argument type to variable 'innodb_support_xa'
 SET @@session.innodb_support_xa = 1.6;
-ERROR 42000: Variable 'support_xa' can't be set to the value of '1.6'
+ERROR 42000: Incorrect argument type to variable 'innodb_support_xa'
 SET @@session.innodb_support_xa = "T";
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'T'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'T'
 SET @@session.innodb_support_xa = "Y";
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'Y'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'Y'
 SET @@session.innodb_support_xa = TR<54>E;
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'TRÜE'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'TR<EFBFBD>E'
 SET @@session.innodb_support_xa = <20>N;
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'ÕN'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '<EFBFBD>N'
 SET @@session.innodb_support_xa = OF;
 SELECT @@session.innodb_support_xa;
 @@session.innodb_support_xa
 0
-'Bug# 34828: OF is taken as OFF and a value of 0 is set.'
 SET @@session.innodb_support_xa = <20>FF;
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'ÓFF'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '<EFBFBD>FF'
 SET @@global.innodb_support_xa = -1;
 SELECT @@global.innodb_support_xa;
 @@global.innodb_support_xa
 1
 SET @@global.innodb_support_xa = 2;
-ERROR 42000: Variable 'support_xa' can't be set to the value of '2'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '2'
 SET @@global.innodb_support_xa = "T";
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'T'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'T'
 SET @@global.innodb_support_xa = "Y";
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'Y'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'Y'
 SET @@global.innodb_support_xa = TR<54>E;
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'TRÜE'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of 'TR<EFBFBD>E'
 SET @@global.innodb_support_xa = <20>N;
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'ÕN'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '<EFBFBD>N'
 SET @@global.innodb_support_xa = OF;
 SELECT @@global.innodb_support_xa;
 @@global.innodb_support_xa
 0
-'Bug# 34828 : OF is taken as OFF and a value of 0 is set.'
 SET @@global.innodb_support_xa = <20>FF;
-ERROR 42000: Variable 'support_xa' can't be set to the value of 'ÓFF'
+ERROR 42000: Variable 'innodb_support_xa' can't be set to the value of '<EFBFBD>FF'
 '#-------------------FN_DYNVARS_046_05----------------------------#'
 SET @@global.innodb_support_xa = 0;
 SET @@session.innodb_support_xa = 1;

mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic.result

@@ -35,19 +35,21 @@ SELECT @@global.innodb_sync_spin_loops;
 1000
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@global.innodb_sync_spin_loops = -1;
+Warnings:
+Warning	1292	Truncated incorrect innodb_sync_spin_loops value: '-1'
 SELECT @@global.innodb_sync_spin_loops;
 @@global.innodb_sync_spin_loops
-18446744073709551615
+0
 SET @@global.innodb_sync_spin_loops = "T";
 ERROR 42000: Incorrect argument type to variable 'innodb_sync_spin_loops'
 SELECT @@global.innodb_sync_spin_loops;
 @@global.innodb_sync_spin_loops
-18446744073709551615
+0
 SET @@global.innodb_sync_spin_loops = "Y";
 ERROR 42000: Incorrect argument type to variable 'innodb_sync_spin_loops'
 SELECT @@global.innodb_sync_spin_loops;
 @@global.innodb_sync_spin_loops
-18446744073709551615
+0
 SET @@global.innodb_sync_spin_loops = 1001;
 SELECT @@global.innodb_sync_spin_loops;
 @@global.innodb_sync_spin_loops

mysql-test/suite/sys_vars/r/innodb_sync_spin_loops_basic_32.result

@@ -1,94 +0,0 @@
-SET @global_start_value = @@global.innodb_sync_spin_loops;
-SELECT @global_start_value;
-@global_start_value
-30
-'#--------------------FN_DYNVARS_046_01------------------------#'
-SET @@global.innodb_sync_spin_loops = 0;
-SET @@global.innodb_sync_spin_loops = DEFAULT;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-30
-'#---------------------FN_DYNVARS_046_02-------------------------#'
-SET innodb_sync_spin_loops = 1;
-ERROR HY000: Variable 'innodb_sync_spin_loops' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@innodb_sync_spin_loops;
-@@innodb_sync_spin_loops
-30
-SELECT local.innodb_sync_spin_loops;
-ERROR 42S02: Unknown table 'local' in field list
-SET global innodb_sync_spin_loops = 0;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-0
-'#--------------------FN_DYNVARS_046_03------------------------#'
-SET @@global.innodb_sync_spin_loops = 0;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-0
-SET @@global.innodb_sync_spin_loops = 1;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-1
-SET @@global.innodb_sync_spin_loops = 1000;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-1000
-'#--------------------FN_DYNVARS_046_04-------------------------#'
-SET @@global.innodb_sync_spin_loops = -1;
-Warnings:
-Warning	1292	Truncated incorrect sync_spin_loops value: '18446744073709551615'
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-4294967295
-SET @@global.innodb_sync_spin_loops = "T";
-ERROR 42000: Incorrect argument type to variable 'innodb_sync_spin_loops'
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-4294967295
-SET @@global.innodb_sync_spin_loops = "Y";
-ERROR 42000: Incorrect argument type to variable 'innodb_sync_spin_loops'
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-4294967295
-SET @@global.innodb_sync_spin_loops = 1001;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-1001
-'#----------------------FN_DYNVARS_046_05------------------------#'
-SELECT @@global.innodb_sync_spin_loops =
-VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_sync_spin_loops';
-@@global.innodb_sync_spin_loops =
-VARIABLE_VALUE
-1
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-1001
-SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='innodb_sync_spin_loops';
-VARIABLE_VALUE
-1001
-'#---------------------FN_DYNVARS_046_06-------------------------#'
-SET @@global.innodb_sync_spin_loops = OFF;
-ERROR 42000: Incorrect argument type to variable 'innodb_sync_spin_loops'
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-1001
-SET @@global.innodb_sync_spin_loops = ON;
-ERROR 42000: Incorrect argument type to variable 'innodb_sync_spin_loops'
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-1001
-'#---------------------FN_DYNVARS_046_07----------------------#'
-SET @@global.innodb_sync_spin_loops = TRUE;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-1
-SET @@global.innodb_sync_spin_loops = FALSE;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-0
-SET @@global.innodb_sync_spin_loops = @global_start_value;
-SELECT @@global.innodb_sync_spin_loops;
-@@global.innodb_sync_spin_loops
-30

mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result

@@ -56,38 +56,36 @@ SELECT @@global.innodb_table_locks;
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@session.innodb_table_locks = -6;
 SET @@session.innodb_table_locks = 1.6;
-ERROR 42000: Variable 'table_locks' can't be set to the value of '1.6'
+ERROR 42000: Incorrect argument type to variable 'innodb_table_locks'
 SET @@session.innodb_table_locks = "T";
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'T'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'T'
 SET @@session.innodb_table_locks = "Y";
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'Y'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'Y'
 SET @@session.innodb_table_locks = TR<54>E;
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'TRÜE'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'TR<EFBFBD>E'
 SET @@session.innodb_table_locks = <20>N;
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'ÕN'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of '<EFBFBD>N'
 SET @@session.innodb_table_locks = OF;
 SELECT @@session.innodb_table_locks;
 @@session.innodb_table_locks
 0
-'Bug# 34828: OF is taken as OFF and a value of 0 is set.'
 SET @@session.innodb_table_locks = <20>FF;
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'ÓFF'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of '<EFBFBD>FF'
 SET @@global.innodb_table_locks = -1;
 SET @@global.innodb_table_locks = 2;
-ERROR 42000: Variable 'table_locks' can't be set to the value of '2'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of '2'
 SET @@global.innodb_table_locks = "T";
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'T'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'T'
 SET @@global.innodb_table_locks = "Y";
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'Y'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'Y'
 SET @@global.innodb_table_locks = TR<54>E;
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'TRÜE'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'TR<EFBFBD>E'
 SET @@global.innodb_table_locks = QN;
-ERROR 42000: Variable 'table_locks' can't be set to the value of 'QN'
+ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'QN'
 SET @@global.innodb_table_locks = OF;
 SELECT @@global.innodb_table_locks;
 @@global.innodb_table_locks
 0
-'Bug# 34828: OF is taken as OFF and a value of 0 is set.'
 '#-------------------FN_DYNVARS_046_05----------------------------#'
 SET @@global.innodb_table_locks = 0;
 SET @@session.innodb_table_locks = 1;

mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result

@@ -36,23 +36,23 @@ SELECT @@global.innodb_thread_concurrency;
 '#--------------------FN_DYNVARS_046_04-------------------------#'
 SET @@global.innodb_thread_concurrency = -1;
 Warnings:
-Warning	1292	Truncated incorrect thread_concurrency value: '18446744073709551615'
+Warning	1292	Truncated incorrect innodb_thread_concurrency value: '-1'
 SELECT @@global.innodb_thread_concurrency;
 @@global.innodb_thread_concurrency
-1000
+0
 SET @@global.innodb_thread_concurrency = "T";
 ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency'
 SELECT @@global.innodb_thread_concurrency;
 @@global.innodb_thread_concurrency
-1000
+0
 SET @@global.innodb_thread_concurrency = "Y";
 ERROR 42000: Incorrect argument type to variable 'innodb_thread_concurrency'
 SELECT @@global.innodb_thread_concurrency;
 @@global.innodb_thread_concurrency
-1000
+0
 SET @@global.innodb_thread_concurrency = 1001;
 Warnings:
-Warning	1292	Truncated incorrect thread_concurrency value: '1001'
+Warning	1292	Truncated incorrect innodb_thread_concurrency value: '1001'
 SELECT @@global.innodb_thread_concurrency;
 @@global.innodb_thread_concurrency
 1000

mysql-test/suite/sys_vars/r/insert_id_basic.result

@@ -32,9 +32,11 @@ SELECT @@session.insert_id;
 65535
 '#--------------------FN_DYNVARS_051_04-------------------------#'
 SET @@session.insert_id = -1;
+Warnings:
+Warning	1292	Truncated incorrect insert_id value: '-1'
 SELECT @@session.insert_id;
 @@session.insert_id
--1
+0
 SET @@session.insert_id = 100000000000;
 SELECT @@session.insert_id;
 @@session.insert_id
@@ -45,14 +47,15 @@ SELECT @@session.insert_id;
 @@session.insert_id
 100000000000
 SET @@session.insert_id = -1024;
+Warnings:
+Warning	1292	Truncated incorrect insert_id value: '-1024'
 SELECT @@session.insert_id;
 @@session.insert_id
--1024
+0
 SET @@session.insert_id = 42949672950;
 SELECT @@session.insert_id;
 @@session.insert_id
 42949672950
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@session.insert_id = ON;
 ERROR 42000: Incorrect argument type to variable 'insert_id'
 SELECT @@session.insert_id;

mysql-test/suite/sys_vars/r/interactive_timeout_basic.result

@@ -71,8 +71,8 @@ Warning	1292	Truncated incorrect interactive_timeout value: '1000000000'
 SELECT @@global.interactive_timeout;
 @@global.interactive_timeout
 31536000
-SET @@global.interactive_timeout = 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
+SET @@global.interactive_timeout = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'interactive_timeout'
 SELECT @@global.interactive_timeout;
 @@global.interactive_timeout
 31536000
@@ -93,15 +93,14 @@ Warning	1292	Truncated incorrect interactive_timeout value: '-2'
 SELECT @@session.interactive_timeout;
 @@session.interactive_timeout
 1
-SET @@session.interactive_timeout = 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
+SET @@session.interactive_timeout = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'interactive_timeout'
 SET @@session.interactive_timeout = 100000000;
 Warnings:
 Warning	1292	Truncated incorrect interactive_timeout value: '100000000'
 SELECT @@session.interactive_timeout;
 @@session.interactive_timeout
 31536000
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@session.interactive_timeout = test;
 ERROR 42000: Incorrect argument type to variable 'interactive_timeout'
 SELECT @@session.interactive_timeout;

mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result

@@ -7,36 +7,21 @@ SELECT @start_session_value;
 @start_session_value
 131072
 '#--------------------FN_DYNVARS_053_01-------------------------#'
-SET @@global.join_buffer_size = 8200;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
 SET @@global.join_buffer_size = DEFAULT;
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
 131072
-SET @@session.join_buffer_size = 8200;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
 SET @@session.join_buffer_size = DEFAULT;
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
 131072
-'#--------------------FN_DYNVARS_053_02-------------------------#'
-SET @@global.join_buffer_size = DEFAULT;
-SELECT @@global.join_buffer_size = 131072;
-@@global.join_buffer_size = 131072
-1
-SET @@session.join_buffer_size = DEFAULT;
-SELECT @@session.join_buffer_size = 131072;
-@@session.join_buffer_size = 131072
-1
 '#--------------------FN_DYNVARS_053_03-------------------------#'
 SET @@global.join_buffer_size = 8200;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+8192
 SET @@global.join_buffer_size = 65536;
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
@@ -46,15 +31,14 @@ Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
+4294967168
 '#--------------------FN_DYNVARS_053_04-------------------------#'
 SET @@session.join_buffer_size = 8200;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
-1
+SELECT @@session.join_buffer_size;
+@@session.join_buffer_size
+8192
 SET @@session.join_buffer_size = 65536;
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
@@ -64,78 +48,76 @@ Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
+4294967168
 '#------------------FN_DYNVARS_053_05-----------------------#'
 SET @@global.join_buffer_size = 0;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+128
 SET @@global.join_buffer_size = -1024;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '-1024'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
-SET @@global.join_buffer_size = 8199;
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+128
+SET @@global.join_buffer_size = 127;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8199'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
+Warning	1292	Truncated incorrect join_buffer_size value: '127'
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+128
 SET @@global.join_buffer_size = 42949672951;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
-SET @@global.join_buffer_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
+4294967168
+SET @@global.join_buffer_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
+4294967168
 SET @@global.join_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
+4294967168
 SET @@session.join_buffer_size = 0;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
-1
-SET @@session.join_buffer_size = -2;
+SELECT @@session.join_buffer_size;
+@@session.join_buffer_size
+128
+SET @@session.join_buffer_size = -1024;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '-2'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
-1
-SET @@session.join_buffer_size = 8199;
+Warning	1292	Truncated incorrect join_buffer_size value: '-1024'
+SELECT @@session.join_buffer_size;
+@@session.join_buffer_size
+128
+SET @@session.join_buffer_size = 127;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8199'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
-1
+Warning	1292	Truncated incorrect join_buffer_size value: '127'
+SELECT @@session.join_buffer_size;
+@@session.join_buffer_size
+128
 SET @@session.join_buffer_size = 42949672951;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
-SET @@session.join_buffer_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
+4294967168
+SET @@session.join_buffer_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
+4294967168
 SET @@session.join_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
+4294967168
 '#------------------FN_DYNVARS_053_06-----------------------#'
 SELECT @@global.join_buffer_size = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
@@ -152,16 +134,9 @@ WHERE VARIABLE_NAME='join_buffer_size';
 SET @@global.join_buffer_size = TRUE;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
 SET @@global.join_buffer_size = FALSE;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
-'Bug: Errors are not coming on assigning TRUE/FALSE to variable';
 '#---------------------FN_DYNVARS_001_09----------------------#'
 SET @@global.join_buffer_size = 10;
 Warnings:
@@ -183,9 +158,9 @@ SELECT @@local.join_buffer_size = @@session.join_buffer_size;
 SET join_buffer_size = 1;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SELECT @@join_buffer_size=8200 OR @@join_buffer_size= 8228;
-@@join_buffer_size=8200 OR @@join_buffer_size= 8228
-1
+SELECT @@join_buffer_size;
+@@join_buffer_size
+128
 SELECT local.join_buffer_size;
 ERROR 42S02: Unknown table 'local' in field list
 SELECT session.join_buffer_size;

mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result

@@ -7,127 +7,117 @@ SELECT @start_session_value;
 @start_session_value
 131072
 '#--------------------FN_DYNVARS_053_01-------------------------#'
-SET @@global.join_buffer_size = 8200;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
 SET @@global.join_buffer_size = DEFAULT;
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
 131072
-SET @@session.join_buffer_size = 8200;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8200'
 SET @@session.join_buffer_size = DEFAULT;
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
 131072
-'#--------------------FN_DYNVARS_053_02-------------------------#'
-SET @@global.join_buffer_size = DEFAULT;
-SELECT @@global.join_buffer_size = 131072;
-@@global.join_buffer_size = 131072
-1
-SET @@session.join_buffer_size = DEFAULT;
-SELECT @@session.join_buffer_size = 131072;
-@@session.join_buffer_size = 131072
-1
 '#--------------------FN_DYNVARS_053_03-------------------------#'
 SET @@global.join_buffer_size = 8200;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+8192
 SET @@global.join_buffer_size = 65536;
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
 65536
 SET @@global.join_buffer_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-4294963200
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
+4294967168
 '#--------------------FN_DYNVARS_053_04-------------------------#'
 SET @@session.join_buffer_size = 8200;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '8200'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
-1
+SELECT @@session.join_buffer_size;
+@@session.join_buffer_size
+8192
 SET @@session.join_buffer_size = 65536;
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
 65536
 SET @@session.join_buffer_size = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect join_buffer_size value: '4294967295'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-4294963200
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
+4294967168
 '#------------------FN_DYNVARS_053_05-----------------------#'
 SET @@global.join_buffer_size = 0;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+128
 SET @@global.join_buffer_size = -1024;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '-1024'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
-SET @@global.join_buffer_size = 8199;
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+128
+SET @@global.join_buffer_size = 127;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8199'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
+Warning	1292	Truncated incorrect join_buffer_size value: '127'
+SELECT @@global.join_buffer_size;
+@@global.join_buffer_size
+128
 SET @@global.join_buffer_size = 42949672951;
+Warnings:
+Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-42949668864
-SET @@global.join_buffer_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
+42949672832
+SET @@global.join_buffer_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-42949668864
+42949672832
 SET @@global.join_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@global.join_buffer_size;
 @@global.join_buffer_size
-42949668864
+42949672832
 SET @@session.join_buffer_size = 0;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
-1
-SET @@session.join_buffer_size = -2;
+SELECT @@session.join_buffer_size;
+@@session.join_buffer_size
+128
+SET @@session.join_buffer_size = -1024;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '-2'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
-1
-SET @@session.join_buffer_size = 8199;
+Warning	1292	Truncated incorrect join_buffer_size value: '-1024'
+SELECT @@session.join_buffer_size;
+@@session.join_buffer_size
+128
+SET @@session.join_buffer_size = 127;
 Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '8199'
-SELECT @@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228;
-@@session.join_buffer_size=8200 OR @@session.join_buffer_size= 8228
-1
+Warning	1292	Truncated incorrect join_buffer_size value: '127'
+SELECT @@session.join_buffer_size;
+@@session.join_buffer_size
+128
 SET @@session.join_buffer_size = 42949672951;
+Warnings:
+Warning	1292	Truncated incorrect join_buffer_size value: '42949672951'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-42949668864
-SET @@session.join_buffer_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
+42949672832
+SET @@session.join_buffer_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-42949668864
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
+42949672832
 SET @@session.join_buffer_size = test;
 ERROR 42000: Incorrect argument type to variable 'join_buffer_size'
 SELECT @@session.join_buffer_size;
 @@session.join_buffer_size
-42949668864
+42949672832
 '#------------------FN_DYNVARS_053_06-----------------------#'
 SELECT @@global.join_buffer_size = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
@@ -144,16 +134,9 @@ WHERE VARIABLE_NAME='join_buffer_size';
 SET @@global.join_buffer_size = TRUE;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
 SET @@global.join_buffer_size = FALSE;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '0'
-SELECT @@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228;
-@@global.join_buffer_size=8200 OR @@global.join_buffer_size= 8228
-1
-'Bug: Errors are not coming on assigning TRUE/FALSE to variable';
 '#---------------------FN_DYNVARS_001_09----------------------#'
 SET @@global.join_buffer_size = 10;
 Warnings:
@@ -175,9 +158,9 @@ SELECT @@local.join_buffer_size = @@session.join_buffer_size;
 SET join_buffer_size = 1;
 Warnings:
 Warning	1292	Truncated incorrect join_buffer_size value: '1'
-SELECT @@join_buffer_size=8200 OR @@join_buffer_size= 8228;
-@@join_buffer_size=8200 OR @@join_buffer_size= 8228
-1
+SELECT @@join_buffer_size;
+@@join_buffer_size
+128
 SELECT local.join_buffer_size;
 ERROR 42S02: Unknown table 'local' in field list
 SELECT session.join_buffer_size;

mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result

@@ -94,7 +94,7 @@ ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of '-1024
 SET @@global.keep_files_on_create = 65536;
 ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of '65536'
 SET @@global.keep_files_on_create = 65530.34;
-ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of '65530'
+ERROR 42000: Incorrect argument type to variable 'keep_files_on_create'
 SET @@global.keep_files_on_create = test;
 ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of 'test'
 SET @@session.keep_files_on_create = ONN;
@@ -102,16 +102,13 @@ ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of 'ONN'
 SET @@session.keep_files_on_create = ONF;
 ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of 'ONF'
 SET @@session.keep_files_on_create = OF;
-SELECT @@session.keep_files_on_create;
-@@session.keep_files_on_create
-0
-'Bug# 34828: FN_DYNVARS_054_05 - OF is also working as OFF and no error is coming';
+ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of 'OF'
 SET @@session.keep_files_on_create = 'OFN';
 ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of 'OFN'
 SET @@session.keep_files_on_create = -2;
 ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of '-2'
-SET @@session.keep_files_on_create = 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
+SET @@session.keep_files_on_create = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'keep_files_on_create'
 SET @@session.keep_files_on_create = 65550;
 ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of '65550'
 SET @@session.keep_files_on_create = test;

mysql-test/suite/sys_vars/r/key_buffer_size_basic.result

@@ -1,57 +1,44 @@
 SET @start_value = @@global.key_buffer_size;
 '#--------------------FN_DYNVARS_055_01------------------------#'
-SET @@global.key_buffer_size = 99;
 SET @@global.key_buffer_size = DEFAULT;
-ERROR 42000: Variable 'key_buffer_size' doesn't have a default value
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
+SELECT @@global.key_buffer_size;
+@@global.key_buffer_size
+8388608
 '#---------------------FN_DYNVARS_055_02-------------------------#'
 SET @@global.key_buffer_size = @start_value;
 SELECT @@global.key_buffer_size = @start_value;
 @@global.key_buffer_size = @start_value
 1
 '#--------------------FN_DYNVARS_055_03------------------------#'
-SET @@global.key_buffer_size = 8 ;
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-SET @@global.key_buffer_size = 1800;
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
 SET @@global.key_buffer_size = 65535;
+Warnings:
+Warning	1292	Truncated incorrect key_buffer_size value: '65535'
 SELECT @@global.key_buffer_size;
 @@global.key_buffer_size
 61440
 '#--------------------FN_DYNVARS_055_04-------------------------#'
+SET @@global.key_buffer_size = -1;
+ERROR HY000: Cannot drop default keycache
+SET @@global.key_buffer_size = 4;
+ERROR HY000: Cannot drop default keycache
 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
 61440
-SET @@global.key_buffer_size = 4;
-Warnings:
-Warning	1292	Truncated incorrect key_buffer_size value: '4'
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
 SET @@global.key_buffer_size = ON;
 ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
+SELECT @@global.key_buffer_size;
+@@global.key_buffer_size
+61440
 SET @@global.key_buffer_size = 'test';
 ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
+SELECT @@global.key_buffer_size;
+@@global.key_buffer_size
+61440
 '#-------------------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
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
 '#----------------------FN_DYNVARS_055_06------------------------#'
 SELECT @@global.key_buffer_size = VARIABLE_VALUE
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
@@ -65,28 +52,16 @@ WHERE VARIABLE_NAME='key_buffer_size';
 1
 '#---------------------FN_DYNVARS_055_07----------------------#'
 SET @@global.key_buffer_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect key_buffer_size value: '1'
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
+ERROR HY000: Cannot drop default keycache
 SET @@global.key_buffer_size = FALSE;
-Warnings:
-Warning	1438	Cannot drop default keycache
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
+ERROR HY000: Cannot drop default keycache
 '#---------------------FN_DYNVARS_055_08----------------------#'
-SET @@global.key_buffer_size = 8 ;
 SELECT @@key_buffer_size = @@global.key_buffer_size;
 @@key_buffer_size = @@global.key_buffer_size
 1
 '#---------------------FN_DYNVARS_055_09----------------------#'
 SET key_buffer_size = 8 ;
 ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
 SET local.key_buffer_size = 10;
 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 'key_buffer_size = 10' at line 1
 SELECT local.key_buffer_size;

mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result

@@ -1,100 +0,0 @@
-SET @start_value = @@global.key_buffer_size;
-'#--------------------FN_DYNVARS_055_01------------------------#'
-SET @@global.key_buffer_size = 99;
-SET @@global.key_buffer_size = DEFAULT;
-ERROR 42000: Variable 'key_buffer_size' doesn't have a default value
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-'#---------------------FN_DYNVARS_055_02-------------------------#'
-SET @@global.key_buffer_size = @start_value;
-SELECT @@global.key_buffer_size = @start_value;
-@@global.key_buffer_size = @start_value
-1
-'#--------------------FN_DYNVARS_055_03------------------------#'
-SET @@global.key_buffer_size = 8 ;
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-SET @@global.key_buffer_size = 1800;
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-SET @@global.key_buffer_size = 65535;
-SELECT @@global.key_buffer_size;
-@@global.key_buffer_size
-61440
-'#--------------------FN_DYNVARS_055_04-------------------------#'
-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
-61440
-SET @@global.key_buffer_size = 4;
-Warnings:
-Warning	1292	Truncated incorrect key_buffer_size value: '4'
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-SET @@global.key_buffer_size = ON;
-ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-SET @@global.key_buffer_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'key_buffer_size'
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-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
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-'#----------------------FN_DYNVARS_055_06------------------------#'
-SELECT @@global.key_buffer_size = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
-WHERE VARIABLE_NAME='key_buffer_size';
-@@global.key_buffer_size = VARIABLE_VALUE
-1
-SELECT @@key_buffer_size = VARIABLE_VALUE
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES
-WHERE VARIABLE_NAME='key_buffer_size';
-@@key_buffer_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_055_07----------------------#'
-SET @@global.key_buffer_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect key_buffer_size value: '1'
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-SET @@global.key_buffer_size = FALSE;
-Warnings:
-Warning	1438	Cannot drop default keycache
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-'#---------------------FN_DYNVARS_055_08----------------------#'
-SET @@global.key_buffer_size = 8 ;
-SELECT @@key_buffer_size = @@global.key_buffer_size;
-@@key_buffer_size = @@global.key_buffer_size
-1
-'#---------------------FN_DYNVARS_055_09----------------------#'
-SET key_buffer_size = 8 ;
-ERROR HY000: Variable 'key_buffer_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@global.key_buffer_size BETWEEN 8 AND 36;
-@@global.key_buffer_size BETWEEN 8 AND 36
-1
-SET local.key_buffer_size = 10;
-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 'key_buffer_size = 10' at line 1
-SELECT local.key_buffer_size;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.key_buffer_size = 10;
-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 'key_buffer_size = 10' at line 1
-SELECT global.key_buffer_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT key_buffer_size = @@session.key_buffer_size;
-ERROR 42S22: Unknown column 'key_buffer_size' in 'field list'
-SET @@global.key_buffer_size = @start_value;

mysql-test/suite/sys_vars/r/key_buffer_size_func.result

@@ -38,7 +38,6 @@ Key_reads	0
 show status like 'Key_reads';
 Variable_name	Value
 Key_reads	0
-SET @@global.key_buffer_size = 36;
 ## Connecting with connection test_con1 ##
 ## Inserting some rows in table ##
 INSERT INTO t1(rollno, name) VALUES(5, 'Record_11');
@@ -54,7 +53,7 @@ INSERT INTO t1(rollno, name) VALUES(8, 'Record_20');
 ## Key_reads must be zero (no disk access) ##
 show status like 'Key_reads';
 Variable_name	Value
-Key_reads	10
+Key_reads	0
 ## Dropping table ##
 DROP TABLE IF EXISTS t1;
 ## Disconnecting both the connections ##

mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_32.result

@@ -3,15 +3,10 @@ SELECT @start_value;
 @start_value
 300
 '#--------------------FN_DYNVARS_056_01------------------------#'
-SET @@global.key_cache_age_threshold = 99;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '99'
 SET @@global.key_cache_age_threshold = DEFAULT;
-ERROR 42000: Variable 'key_cache_age_threshold' doesn't have a default value
-'Bug# 34878: This variable has default value according to documentation';
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
-100
+300
 '#---------------------FN_DYNVARS_056_02-------------------------#'
 SET @@global.key_cache_age_threshold = @start_value;
 SELECT @@global.key_cache_age_threshold = 300;
@@ -23,6 +18,8 @@ SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 100
 SET @@global.key_cache_age_threshold = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '4294967295'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 4294967200
@@ -31,17 +28,18 @@ SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 1800
 SET @@global.key_cache_age_threshold = 65535;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '65535'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 65500
-'Bug# 34877 : Invalid Values are coming in variable on assigning valid values and Out Of Memory Warnings are coming';
 '#--------------------FN_DYNVARS_056_04-------------------------#'
 SET @@global.key_cache_age_threshold = -1;
 Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '18446744073709551615'
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '-1'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
-4294967200
+100
 SET @@global.key_cache_age_threshold = 42949672951;
 Warnings:
 Warning	1292	Truncated incorrect key_cache_age_threshold value: '42949672951'
@@ -55,17 +53,16 @@ SELECT @@global.key_cache_age_threshold;
 4294967200
 SET @@global.key_cache_age_threshold = -1024;
 Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '18446744073709550592'
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '-1024'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
-4294967200
+100
 SET @@global.key_cache_age_threshold = 99;
 Warnings:
 Warning	1292	Truncated incorrect key_cache_age_threshold value: '99'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 100
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.key_cache_age_threshold = ON;
 ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold'
 SELECT @@global.key_cache_age_threshold;
@@ -107,6 +104,8 @@ SELECT @@global.key_cache_age_threshold;
 100
 '#---------------------FN_DYNVARS_056_08----------------------#'
 SET @@global.key_cache_age_threshold = 101;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '101'
 SELECT @@key_cache_age_threshold = @@global.key_cache_age_threshold;
 @@key_cache_age_threshold = @@global.key_cache_age_threshold
 1

mysql-test/suite/sys_vars/r/key_cache_age_threshold_basic_64.result

@@ -3,15 +3,10 @@ SELECT @start_value;
 @start_value
 300
 '#--------------------FN_DYNVARS_056_01------------------------#'
-SET @@global.key_cache_age_threshold = 99;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_age_threshold value: '99'
 SET @@global.key_cache_age_threshold = DEFAULT;
-ERROR 42000: Variable 'key_cache_age_threshold' doesn't have a default value
-'Bug# 34878: This variable has default value according to documentation';
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
-100
+300
 '#---------------------FN_DYNVARS_056_02-------------------------#'
 SET @@global.key_cache_age_threshold = @start_value;
 SELECT @@global.key_cache_age_threshold = 300;
@@ -23,6 +18,8 @@ SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 100
 SET @@global.key_cache_age_threshold = 4294967295;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '4294967295'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 4294967200
@@ -31,16 +28,21 @@ SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 1800
 SET @@global.key_cache_age_threshold = 65535;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '65535'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 65500
-'Bug# 34877 : Invalid Values are coming in variable on assigning valid values and Out Of Memory Warnings are coming';
 '#--------------------FN_DYNVARS_056_04-------------------------#'
 SET @@global.key_cache_age_threshold = -1;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '-1'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
-18446744073709551600
+100
 SET @@global.key_cache_age_threshold = 42949672951;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '42949672951'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 42949672900
@@ -50,16 +52,17 @@ SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 42949672900
 SET @@global.key_cache_age_threshold = -1024;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '-1024'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
-18446744073709550500
+100
 SET @@global.key_cache_age_threshold = 99;
 Warnings:
 Warning	1292	Truncated incorrect key_cache_age_threshold value: '99'
 SELECT @@global.key_cache_age_threshold;
 @@global.key_cache_age_threshold
 100
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.key_cache_age_threshold = ON;
 ERROR 42000: Incorrect argument type to variable 'key_cache_age_threshold'
 SELECT @@global.key_cache_age_threshold;
@@ -101,6 +104,8 @@ SELECT @@global.key_cache_age_threshold;
 100
 '#---------------------FN_DYNVARS_056_08----------------------#'
 SET @@global.key_cache_age_threshold = 101;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_age_threshold value: '101'
 SELECT @@key_cache_age_threshold = @@global.key_cache_age_threshold;
 @@key_cache_age_threshold = @@global.key_cache_age_threshold
 1

mysql-test/suite/sys_vars/r/key_cache_block_size_basic.result

@@ -3,13 +3,10 @@ SELECT @start_value;
 @start_value
 1024
 '#--------------------FN_DYNVARS_057_01------------------------#'
-SET @@global.key_cache_block_size = 600;
 SET @@global.key_cache_block_size = DEFAULT;
-ERROR 42000: Variable 'key_cache_block_size' doesn't have a default value
-'Bug# 34877 : Invalid Values are coming in variable on assigning valid values and Out Of Memory Warnings are coming';
 SELECT @@global.key_cache_block_size;
 @@global.key_cache_block_size
-512
+1024
 '#---------------------FN_DYNVARS_057_02-------------------------#'
 SET @@global.key_cache_block_size = @start_value;
 SELECT @@global.key_cache_block_size = 1024;
@@ -25,21 +22,24 @@ SELECT @@global.key_cache_block_size;
 @@global.key_cache_block_size
 16384
 SET @@global.key_cache_block_size = 1800;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_block_size value: '1800'
 SELECT @@global.key_cache_block_size;
 @@global.key_cache_block_size
 1536
 SET @@global.key_cache_block_size = 16383;
+Warnings:
+Warning	1292	Truncated incorrect key_cache_block_size value: '16383'
 SELECT @@global.key_cache_block_size;
 @@global.key_cache_block_size
 15872
-'Bug# 34877 : Invalid Values are coming in variable on assigning valid values and Out Of Memory Warnings are coming';
 '#--------------------FN_DYNVARS_057_04-------------------------#'
 SET @@global.key_cache_block_size = -1;
 Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '18446744073709551615'
+Warning	1292	Truncated incorrect key_cache_block_size value: '-1'
 SELECT @@global.key_cache_block_size;
 @@global.key_cache_block_size
-16384
+512
 SET @@global.key_cache_block_size = 42949672951;
 Warnings:
 Warning	1292	Truncated incorrect key_cache_block_size value: '42949672951'
@@ -53,10 +53,10 @@ SELECT @@global.key_cache_block_size;
 16384
 SET @@global.key_cache_block_size = -1024;
 Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '18446744073709550592'
+Warning	1292	Truncated incorrect key_cache_block_size value: '-1024'
 SELECT @@global.key_cache_block_size;
 @@global.key_cache_block_size
-16384
+512
 SET @@global.key_cache_block_size = 256;
 Warnings:
 Warning	1292	Truncated incorrect key_cache_block_size value: '256'
@@ -75,7 +75,6 @@ Warning	1292	Truncated incorrect key_cache_block_size value: '16385'
 SELECT @@global.key_cache_block_size;
 @@global.key_cache_block_size
 16384
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.key_cache_block_size = ON;
 ERROR 42000: Incorrect argument type to variable 'key_cache_block_size'
 SELECT @@global.key_cache_block_size;

mysql-test/suite/sys_vars/r/key_cache_block_size_basic_32.result

@@ -1,142 +0,0 @@
-SET @start_value = @@global.key_cache_block_size;
-SELECT @start_value;
-@start_value
-1024
-'#--------------------FN_DYNVARS_057_01------------------------#'
-SET @@global.key_cache_block_size = 600;
-SET @@global.key_cache_block_size = DEFAULT;
-ERROR 42000: Variable 'key_cache_block_size' doesn't have a default value
-'Bug# 34877 : Invalid Values are coming in variable on assigning valid values and Out Of Memory Warnings are coming';
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-512
-'#---------------------FN_DYNVARS_057_02-------------------------#'
-SET @@global.key_cache_block_size = @start_value;
-SELECT @@global.key_cache_block_size = 1024;
-@@global.key_cache_block_size = 1024
-1
-'#--------------------FN_DYNVARS_057_03------------------------#'
-SET @@global.key_cache_block_size = 1024;
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-1024
-SET @@global.key_cache_block_size = 16384;
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-16384
-SET @@global.key_cache_block_size = 1800;
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-1536
-SET @@global.key_cache_block_size = 16383;
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-15872
-'Bug# 34877 : Invalid Values are coming in variable on assigning valid values and Out Of Memory Warnings are coming';
-'#--------------------FN_DYNVARS_057_04-------------------------#'
-SET @@global.key_cache_block_size = -1;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '18446744073709551615'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-16384
-SET @@global.key_cache_block_size = 42949672951;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '42949672951'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-16384
-SET @@global.key_cache_block_size = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'key_cache_block_size'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-16384
-SET @@global.key_cache_block_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '18446744073709550592'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-16384
-SET @@global.key_cache_block_size = 256;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '256'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-512
-SET @@global.key_cache_block_size = 511;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '511'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-512
-SET @@global.key_cache_block_size = 16385;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '16385'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-16384
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
-SET @@global.key_cache_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'key_cache_block_size'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-16384
-SET @@global.key_cache_block_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'key_cache_block_size'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-16384
-'#-------------------FN_DYNVARS_057_05----------------------------#'
-SET @@session.key_cache_block_size = 0;
-ERROR HY000: Variable 'key_cache_block_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.key_cache_block_size;
-ERROR HY000: Variable 'key_cache_block_size' is a GLOBAL variable
-'#----------------------FN_DYNVARS_057_06------------------------#'
-SELECT @@global.key_cache_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='key_cache_block_size';
-@@global.key_cache_block_size = VARIABLE_VALUE
-1
-SELECT @@key_cache_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='key_cache_block_size';
-@@key_cache_block_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_057_07----------------------#'
-SET @@global.key_cache_block_size = TRUE;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '1'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-512
-SET @@global.key_cache_block_size = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_block_size value: '0'
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-512
-'#---------------------FN_DYNVARS_057_08----------------------#'
-SET @@global.key_cache_block_size = 1024;
-SELECT @@key_cache_block_size = @@global.key_cache_block_size;
-@@key_cache_block_size = @@global.key_cache_block_size
-1
-'#---------------------FN_DYNVARS_057_09----------------------#'
-SET key_cache_block_size = 8000;
-ERROR HY000: Variable 'key_cache_block_size' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@key_cache_block_size;
-@@key_cache_block_size
-1024
-SET local.key_cache_block_size = 10;
-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 'key_cache_block_size = 10' at line 1
-SELECT local.key_cache_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.key_cache_block_size = 10;
-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 'key_cache_block_size = 10' at line 1
-SELECT global.key_cache_block_size;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT key_cache_block_size = @@session.key_cache_block_size;
-ERROR 42S22: Unknown column 'key_cache_block_size' in 'field list'
-SET @@global.key_cache_block_size = @start_value;
-SELECT @@global.key_cache_block_size;
-@@global.key_cache_block_size
-1024

mysql-test/suite/sys_vars/r/key_cache_division_limit_basic.result

@@ -3,13 +3,10 @@ SELECT @start_value;
 @start_value
 100
 '#--------------------FN_DYNVARS_058_01------------------------#'
-SET @@global.key_cache_division_limit = 50;
 SET @@global.key_cache_division_limit = DEFAULT;
-ERROR 42000: Variable 'key_cache_division_limit' doesn't have a default value
-'Bug# 34878: This variable has default value according to documentation';
 SELECT @@global.key_cache_division_limit;
 @@global.key_cache_division_limit
-50
+100
 '#---------------------FN_DYNVARS_058_02-------------------------#'
 SET @@global.key_cache_division_limit = @start_value;
 SELECT @@global.key_cache_division_limit = 100;
@@ -35,10 +32,10 @@ SELECT @@global.key_cache_division_limit;
 '#--------------------FN_DYNVARS_058_04-------------------------#'
 SET @@global.key_cache_division_limit = -1;
 Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '18446744073709551615'
+Warning	1292	Truncated incorrect key_cache_division_limit value: '-1'
 SELECT @@global.key_cache_division_limit;
 @@global.key_cache_division_limit
-100
+1
 SET @@global.key_cache_division_limit = 101;
 Warnings:
 Warning	1292	Truncated incorrect key_cache_division_limit value: '101'
@@ -52,10 +49,10 @@ SELECT @@global.key_cache_division_limit;
 100
 SET @@global.key_cache_division_limit = -1024;
 Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '18446744073709550592'
+Warning	1292	Truncated incorrect key_cache_division_limit value: '-1024'
 SELECT @@global.key_cache_division_limit;
 @@global.key_cache_division_limit
-100
+1
 SET @@global.key_cache_division_limit = 0;
 Warnings:
 Warning	1292	Truncated incorrect key_cache_division_limit value: '0'
@@ -74,7 +71,6 @@ Warning	1292	Truncated incorrect key_cache_division_limit value: '65535'
 SELECT @@global.key_cache_division_limit;
 @@global.key_cache_division_limit
 100
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
 SET @@global.key_cache_division_limit = ON;
 ERROR 42000: Incorrect argument type to variable 'key_cache_division_limit'
 SELECT @@global.key_cache_division_limit;

mysql-test/suite/sys_vars/r/key_cache_division_limit_basic_64.result

@@ -1,139 +0,0 @@
-SET @start_value = @@global.key_cache_division_limit;
-SELECT @start_value;
-@start_value
-100
-'#--------------------FN_DYNVARS_058_01------------------------#'
-SET @@global.key_cache_division_limit = 50;
-SET @@global.key_cache_division_limit = DEFAULT;
-ERROR 42000: Variable 'key_cache_division_limit' doesn't have a default value
-'Bug# 34878: This variable has default value according to documentation';
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-50
-'#---------------------FN_DYNVARS_058_02-------------------------#'
-SET @@global.key_cache_division_limit = @start_value;
-SELECT @@global.key_cache_division_limit = 100;
-@@global.key_cache_division_limit = 100
-1
-'#--------------------FN_DYNVARS_058_03------------------------#'
-SET @@global.key_cache_division_limit = 1;
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-1
-SET @@global.key_cache_division_limit = 50;
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-50
-SET @@global.key_cache_division_limit = 99;
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-99
-SET @@global.key_cache_division_limit = 2;
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-2
-'#--------------------FN_DYNVARS_058_04-------------------------#'
-SET @@global.key_cache_division_limit = -1;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '18446744073709551615'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100
-SET @@global.key_cache_division_limit = 101;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '101'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100
-SET @@global.key_cache_division_limit = 10000.01;
-ERROR 42000: Incorrect argument type to variable 'key_cache_division_limit'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100
-SET @@global.key_cache_division_limit = -1024;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '18446744073709550592'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100
-SET @@global.key_cache_division_limit = 0;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '0'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-1
-SET @@global.key_cache_division_limit = 200;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '200'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100
-SET @@global.key_cache_division_limit = 65535;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '65535'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100
-'Bug # 34837: Errors are not coming on assigning invalid values to variable'
-SET @@global.key_cache_division_limit = ON;
-ERROR 42000: Incorrect argument type to variable 'key_cache_division_limit'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100
-SET @@global.key_cache_division_limit = 'test';
-ERROR 42000: Incorrect argument type to variable 'key_cache_division_limit'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100
-'#-------------------FN_DYNVARS_058_05----------------------------#'
-SET @@session.key_cache_division_limit = 0;
-ERROR HY000: Variable 'key_cache_division_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@session.key_cache_division_limit;
-ERROR HY000: Variable 'key_cache_division_limit' is a GLOBAL variable
-'#----------------------FN_DYNVARS_058_06------------------------#'
-SELECT @@global.key_cache_division_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='key_cache_division_limit';
-@@global.key_cache_division_limit = VARIABLE_VALUE
-1
-SELECT @@key_cache_division_limit = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='key_cache_division_limit';
-@@key_cache_division_limit = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_058_07----------------------#'
-SET @@global.key_cache_division_limit = TRUE;
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-1
-SET @@global.key_cache_division_limit = FALSE;
-Warnings:
-Warning	1292	Truncated incorrect key_cache_division_limit value: '0'
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-1
-'#---------------------FN_DYNVARS_058_08----------------------#'
-SET @@global.key_cache_division_limit = 90;
-SELECT @@key_cache_division_limit = @@global.key_cache_division_limit;
-@@key_cache_division_limit = @@global.key_cache_division_limit
-1
-'#---------------------FN_DYNVARS_058_09----------------------#'
-SET key_cache_division_limit = 80;
-ERROR HY000: Variable 'key_cache_division_limit' is a GLOBAL variable and should be set with SET GLOBAL
-SELECT @@key_cache_division_limit;
-@@key_cache_division_limit
-90
-SET local.key_cache_division_limit = 10;
-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 'key_cache_division_limit = 10' at line 1
-SELECT local.key_cache_division_limit;
-ERROR 42S02: Unknown table 'local' in field list
-SET global.key_cache_division_limit = 10;
-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 'key_cache_division_limit = 10' at line 1
-SELECT global.key_cache_division_limit;
-ERROR 42S02: Unknown table 'global' in field list
-SELECT key_cache_division_limit = @@session.key_cache_division_limit;
-ERROR 42S22: Unknown column 'key_cache_division_limit' in 'field list'
-SET @@global.key_cache_division_limit = @start_value;
-SELECT @@global.key_cache_division_limit;
-@@global.key_cache_division_limit
-100

mysql-test/suite/sys_vars/r/large_files_support_basic.result

@@ -0,0 +1,21 @@
+select @@global.large_files_support;
+@@global.large_files_support
+0
+select @@session.large_files_support;
+ERROR HY000: Variable 'large_files_support' is a GLOBAL variable
+show global variables like 'large_files_support';
+Variable_name	Value
+large_files_support	OFF
+show session variables like 'large_files_support';
+Variable_name	Value
+large_files_support	OFF
+select * from information_schema.global_variables where variable_name='large_files_support';
+VARIABLE_NAME	VARIABLE_VALUE
+LARGE_FILES_SUPPORT	OFF
+select * from information_schema.session_variables where variable_name='large_files_support';
+VARIABLE_NAME	VARIABLE_VALUE
+LARGE_FILES_SUPPORT	OFF
+set global large_files_support=1;
+ERROR HY000: Variable 'large_files_support' is a read only variable
+set session large_files_support=1;
+ERROR HY000: Variable 'large_files_support' is a read only variable

mysql-test/suite/sys_vars/r/large_page_size_basic.result

@@ -0,0 +1,21 @@
+select @@global.large_page_size = 1;
+@@global.large_page_size = 1
+0
+select @@session.large_page_size;
+ERROR HY000: Variable 'large_page_size' is a GLOBAL variable
+show global variables like 'large_page_size';
+Variable_name	Value
+large_page_size	#
+show session variables like 'large_page_size';
+Variable_name	Value
+large_page_size	#
+select * from information_schema.global_variables where variable_name='large_page_size';
+VARIABLE_NAME	VARIABLE_VALUE
+LARGE_PAGE_SIZE	#
+select * from information_schema.session_variables where variable_name='large_page_size';
+VARIABLE_NAME	VARIABLE_VALUE
+LARGE_PAGE_SIZE	#
+set global large_page_size=1;
+ERROR HY000: Variable 'large_page_size' is a read only variable
+set session large_page_size=1;
+ERROR HY000: Variable 'large_page_size' is a read only variable

mysql-test/suite/sys_vars/r/large_pages_basic.result

@@ -0,0 +1,21 @@
+select @@global.large_pages;
+@@global.large_pages
+0
+select @@session.large_pages;
+ERROR HY000: Variable 'large_pages' is a GLOBAL variable
+show global variables like 'large_pages';
+Variable_name	Value
+large_pages	OFF
+show session variables like 'large_pages';
+Variable_name	Value
+large_pages	OFF
+select * from information_schema.global_variables where variable_name='large_pages';
+VARIABLE_NAME	VARIABLE_VALUE
+LARGE_PAGES	OFF
+select * from information_schema.session_variables where variable_name='large_pages';
+VARIABLE_NAME	VARIABLE_VALUE
+LARGE_PAGES	OFF
+set global large_pages=1;
+ERROR HY000: Variable 'large_pages' is a read only variable
+set session large_pages=1;
+ERROR HY000: Variable 'large_pages' is a read only variable

mysql-test/suite/sys_vars/r/last_insert_id_basic.result

@@ -0,0 +1,27 @@
+select @@global.last_insert_id;
+ERROR HY000: Variable 'last_insert_id' is a SESSION variable
+select @@session.last_insert_id;
+@@session.last_insert_id
+0
+show global variables like 'last_insert_id';
+Variable_name	Value
+show session variables like 'last_insert_id';
+Variable_name	Value
+last_insert_id	0
+select * from information_schema.global_variables where variable_name='last_insert_id';
+VARIABLE_NAME	VARIABLE_VALUE
+select * from information_schema.session_variables where variable_name='last_insert_id';
+VARIABLE_NAME	VARIABLE_VALUE
+LAST_INSERT_ID	0
+set session last_insert_id=1;
+select @@session.last_insert_id;
+@@session.last_insert_id
+1
+set global last_insert_id=1;
+ERROR HY000: Variable 'last_insert_id' is a SESSION variable and can't be used with SET GLOBAL
+set session last_insert_id=1.1;
+ERROR 42000: Incorrect argument type to variable 'last_insert_id'
+set session last_insert_id=1e1;
+ERROR 42000: Incorrect argument type to variable 'last_insert_id'
+set session last_insert_id="foo";
+ERROR 42000: Incorrect argument type to variable 'last_insert_id'

mysql-test/suite/sys_vars/r/lc_messages_basic.result

@@ -0,0 +1,46 @@
+SET @start_global_value = @@global.lc_messages;
+SELECT @start_global_value;
+@start_global_value
+en_US
+select @@global.lc_messages;
+@@global.lc_messages
+en_US
+select @@session.lc_messages;
+@@session.lc_messages
+en_US
+show global variables like 'lc_messages';
+Variable_name	Value
+lc_messages	en_US
+show session variables like 'lc_messages';
+Variable_name	Value
+lc_messages	en_US
+select * from information_schema.global_variables where variable_name='lc_messages';
+VARIABLE_NAME	VARIABLE_VALUE
+LC_MESSAGES	en_US
+select * from information_schema.session_variables where variable_name='lc_messages';
+VARIABLE_NAME	VARIABLE_VALUE
+LC_MESSAGES	en_US
+set global lc_messages=1;
+select @@global.lc_messages;
+@@global.lc_messages
+en_GB
+set session lc_messages=2;
+select @@session.lc_messages;
+@@session.lc_messages
+ja_JP
+set global lc_messages="en_US";
+select @@global.lc_messages;
+@@global.lc_messages
+en_US
+set session lc_messages="en_GB";
+select @@session.lc_messages;
+@@session.lc_messages
+en_GB
+set global lc_messages=1.1;
+ERROR 42000: Incorrect argument type to variable 'lc_messages'
+set global lc_messages=1e1;
+ERROR 42000: Incorrect argument type to variable 'lc_messages'
+SET @@global.lc_messages = @start_global_value;
+SELECT @@global.lc_messages;
+@@global.lc_messages
+en_US

mysql-test/suite/sys_vars/r/lc_messages_dir_basic.result

@@ -0,0 +1,21 @@
+select @@global.lc_messages_dir;
+@@global.lc_messages_dir
+MYSQL_SHAREDIR/
+select @@session.lc_messages_dir;
+ERROR HY000: Variable 'lc_messages_dir' is a GLOBAL variable
+show global variables like 'lc_messages_dir';
+Variable_name	Value
+lc_messages_dir	MYSQL_SHAREDIR/
+show session variables like 'lc_messages_dir';
+Variable_name	Value
+lc_messages_dir	MYSQL_SHAREDIR/
+select * from information_schema.global_variables where variable_name='lc_messages_dir';
+VARIABLE_NAME	VARIABLE_VALUE
+LC_MESSAGES_DIR	MYSQL_SHAREDIR/
+select * from information_schema.session_variables where variable_name='lc_messages_dir';
+VARIABLE_NAME	VARIABLE_VALUE
+LC_MESSAGES_DIR	MYSQL_SHAREDIR/
+set global lc_messages_dir=1;
+ERROR HY000: Variable 'lc_messages_dir' is a read only variable
+set session lc_messages_dir=1;
+ERROR HY000: Variable 'lc_messages_dir' is a read only variable

mysql-test/suite/sys_vars/r/lc_time_names_basic.result

@@ -459,13 +459,19 @@ SELECT @@session.lc_time_names;
 @@session.lc_time_names
 sq_AL
 SET @@session.lc_time_names=sr_YU;
+Warnings:
+Warning	1287	'sr_YU' is deprecated; use 'sr_RS' instead
 SELECT @@session.lc_time_names;
 @@session.lc_time_names
-sr_YU
+sr_RS
 SET @@session.lc_time_names=sv_FI;
 SELECT @@session.lc_time_names;
 @@session.lc_time_names
 sv_FI
+SET @@session.lc_time_names=sr_RS;
+SELECT @@session.lc_time_names;
+@@session.lc_time_names
+sr_RS
 SET @@session.lc_time_names=sv_SE;
 SELECT @@session.lc_time_names;
 @@session.lc_time_names
@@ -900,13 +906,19 @@ SELECT @@global.lc_time_names;
 @@global.lc_time_names
 sq_AL
 SET @@global.lc_time_names=sr_YU;
+Warnings:
+Warning	1287	'sr_YU' is deprecated; use 'sr_RS' instead
 SELECT @@global.lc_time_names;
 @@global.lc_time_names
-sr_YU
+sr_RS
 SET @@global.lc_time_names=sv_FI;
 SELECT @@global.lc_time_names;
 @@global.lc_time_names
 sv_FI
+SET @@global.lc_time_names=sr_RS;
+SELECT @@global.lc_time_names;
+@@global.lc_time_names
+sr_RS
 SET @@global.lc_time_names=sv_SE;
 SELECT @@global.lc_time_names;
 @@global.lc_time_names
@@ -1006,7 +1018,11 @@ SELECT @@lc_time_names;
 @@lc_time_names
 zh_HK
 SET @@lc_time_names = 109;
-ERROR HY000: Unknown locale: '109'
+SELECT @@lc_time_names;
+@@lc_time_names
+el_GR
+SET @@lc_time_names = 110;
+ERROR HY000: Unknown locale: '110'
 '#--------------------FN_DYNVARS_060_10-------------------------#'
 SET @@lc_time_names = en_EN;
 ERROR HY000: Unknown locale: 'en_EN'

mysql-test/suite/sys_vars/r/locked_in_memory_basic.result

@@ -0,0 +1,21 @@
+select @@global.locked_in_memory;
+@@global.locked_in_memory
+0
+select @@session.locked_in_memory;
+ERROR HY000: Variable 'locked_in_memory' is a GLOBAL variable
+show global variables like 'locked_in_memory';
+Variable_name	Value
+locked_in_memory	OFF
+show session variables like 'locked_in_memory';
+Variable_name	Value
+locked_in_memory	OFF
+select * from information_schema.global_variables where variable_name='locked_in_memory';
+VARIABLE_NAME	VARIABLE_VALUE
+LOCKED_IN_MEMORY	OFF
+select * from information_schema.session_variables where variable_name='locked_in_memory';
+VARIABLE_NAME	VARIABLE_VALUE
+LOCKED_IN_MEMORY	OFF
+set global locked_in_memory=1;
+ERROR HY000: Variable 'locked_in_memory' is a read only variable
+set session locked_in_memory=1;
+ERROR HY000: Variable 'locked_in_memory' is a read only variable