1 files changed, 16 insertions, 18 deletions

diff --git a/mysql-test/suite/sys_vars/r/sql_warnings_basic.result b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
index cf39ef851d4..762182336c3 100644
--- a/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
@@ -12,7 +12,7 @@ SET @@session.sql_warnings = 1;
 SET @@session.sql_warnings = DEFAULT;
 SELECT @@session.sql_warnings;
 @@session.sql_warnings
-1
+0
 '#---------------------FN_DYNVARS_166_02-------------------------#'
 SET sql_warnings = 1;
 SELECT @@sql_warnings;
@@ -36,34 +36,33 @@ SELECT @@session.sql_warnings;
 @@session.sql_warnings
 1
 '#--------------------FN_DYNVARS_166_04-------------------------#'
-SET @@session.sql_warnings = -0.6;
-ERROR 42000: Variable 'sql_warnings' can't be set to the value of '-1'
-SET @@session.sql_warnings = 1.9;
-ERROR 42000: Variable 'sql_warnings' can't be set to the value of '2'
+SET @@session.sql_warnings = 0.6;
+ERROR 42000: Incorrect argument type to variable 'sql_warnings'
 SET @@session.sql_warnings = "T";
 ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'T'
 SET @@session.sql_warnings = "Y";
 ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'Y'
 SET @@session.sql_warnings = TRÜE;
-ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'TRÃœE'
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'TRÜE'
 SET @@session.sql_warnings = ÕN;
-ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'ÕN'
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'ÕN'
 SET @@session.sql_warnings = OF;
-SELECT @@session.sql_warnings;
-@@session.sql_warnings
-0
-'Bug# 34828: OF is taken as OFF and a value of 0 is set.'
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'OF'
 SET @@session.sql_warnings = ÓFF;
-ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'ÓFF'
+ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'ÓFF'
 SET @@session.sql_warnings = '¹';
 ERROR 42000: Variable 'sql_warnings' can't be set to the value of '¹'
 SET @@session.sql_warnings = NO;
 ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'NO'
 '#-------------------FN_DYNVARS_166_05----------------------------#'
-SET @@global.sql_warnings = 0;
-ERROR HY000: Variable 'sql_warnings' is a SESSION variable and can't be used with SET GLOBAL
+SET @@global.sql_warnings = 1-@@global.sql_warnings;
 SELECT @@global.sql_warnings;
-ERROR HY000: Variable 'sql_warnings' is a SESSION variable
+@@global.sql_warnings
+1
+SET @@global.sql_warnings = 1-@@global.sql_warnings;
+SELECT @@global.sql_warnings;
+@@global.sql_warnings
+0
 '#----------------------FN_DYNVARS_166_06------------------------#'
 SELECT count(VARIABLE_VALUE)
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
@@ -78,13 +77,12 @@ IF(@@session.sql_warnings, "ON", "OFF") = VARIABLE_VALUE
 1
 SELECT @@session.sql_warnings;
 @@session.sql_warnings
-0
+1
 SELECT VARIABLE_VALUE
 FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
 WHERE VARIABLE_NAME='sql_warnings';
 VARIABLE_VALUE
-OFF
-'Bug: value in information schema does not match'
+ON
 '#---------------------FN_DYNVARS_166_08-------------------------#'
 SET @@session.sql_warnings = OFF;
 SELECT @@session.sql_warnings;