diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 5a451982510..d79a7bb4bec 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -1577,6 +1577,171 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t1;
 End of 5.1 tests
+
+#
+# Bug#34828: OF is taken as OFF and a value of 0 is set for variable SQL_notes.
+#
+
+# Checking sql_notes...
+SET @sql_notes_saved = @@sql_notes;
+
+SET @@sql_notes = ON;
+SELECT @@sql_notes;
+@@sql_notes
+1
+
+SET @@sql_notes = OF;
+ERROR 42000: Variable 'sql_notes' can't be set to the value of 'OF'
+SELECT @@sql_notes;
+@@sql_notes
+1
+
+SET @@sql_notes = OFF;
+SELECT @@sql_notes;
+@@sql_notes
+0
+
+SET @@sql_notes = @sql_notes_saved;
+
+# Checking delay_key_write...
+SET @delay_key_write_saved = @@delay_key_write;
+
+SET GLOBAL delay_key_write = ON;
+SELECT @@delay_key_write;
+@@delay_key_write
+ON
+
+SET GLOBAL delay_key_write = OF;
+ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'OF'
+SELECT @@delay_key_write;
+@@delay_key_write
+ON
+
+SET GLOBAL delay_key_write = AL;
+ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'AL'
+SELECT @@delay_key_write;
+@@delay_key_write
+ON
+
+SET GLOBAL delay_key_write = OFF;
+SELECT @@delay_key_write;
+@@delay_key_write
+OFF
+
+SET GLOBAL delay_key_write = ALL;
+SELECT @@delay_key_write;
+@@delay_key_write
+ALL
+
+SET GLOBAL delay_key_write = @delay_key_write_saved;
+
+# Checking sql_safe_updates...
+SET @sql_safe_updates_saved = @@sql_safe_updates;
+
+SET @@sql_safe_updates = ON;
+SELECT @@sql_safe_updates;
+@@sql_safe_updates
+1
+
+SET @@sql_safe_updates = OF;
+ERROR 42000: Variable 'sql_safe_updates' can't be set to the value of 'OF'
+SELECT @@sql_safe_updates;
+@@sql_safe_updates
+1
+
+SET @@sql_safe_updates = OFF;
+SELECT @@sql_safe_updates;
+@@sql_safe_updates
+0
+
+SET @@sql_safe_updates = @sql_safe_updates_saved;
+
+# Checking foreign_key_checks...
+SET @foreign_key_checks_saved = @@foreign_key_checks;
+
+SET @@foreign_key_checks = ON;
+SELECT @@foreign_key_checks;
+@@foreign_key_checks
+1
+
+SET @@foreign_key_checks = OF;
+ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'OF'
+SELECT @@foreign_key_checks;
+@@foreign_key_checks
+1
+
+SET @@foreign_key_checks = OFF;
+SELECT @@foreign_key_checks;
+@@foreign_key_checks
+0
+
+SET @@foreign_key_checks = @foreign_key_checks_saved;
+
+# Checking unique_checks...
+SET @unique_checks_saved = @@unique_checks;
+
+SET @@unique_checks = ON;
+SELECT @@unique_checks;
+@@unique_checks
+1
+
+SET @@unique_checks = OF;
+ERROR 42000: Variable 'unique_checks' can't be set to the value of 'OF'
+SELECT @@unique_checks;
+@@unique_checks
+1
+
+SET @@unique_checks = OFF;
+SELECT @@unique_checks;
+@@unique_checks
+0
+
+SET @@unique_checks = @unique_checks_saved;
+
+# Checking sql_buffer_result...
+SET @sql_buffer_result_saved = @@sql_buffer_result;
+
+SET @@sql_buffer_result = ON;
+SELECT @@sql_buffer_result;
+@@sql_buffer_result
+1
+
+SET @@sql_buffer_result = OF;
+ERROR 42000: Variable 'sql_buffer_result' can't be set to the value of 'OF'
+SELECT @@sql_buffer_result;
+@@sql_buffer_result
+1
+
+SET @@sql_buffer_result = OFF;
+SELECT @@sql_buffer_result;
+@@sql_buffer_result
+0
+
+SET @@sql_buffer_result = @sql_buffer_result_saved;
+
+# Checking sql_quote_show_create...
+SET @sql_quote_show_create_saved = @@sql_quote_show_create;
+
+SET @@sql_quote_show_create = ON;
+SELECT @@sql_quote_show_create;
+@@sql_quote_show_create
+1
+
+SET @@sql_quote_show_create = OF;
+ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'OF'
+SELECT @@sql_quote_show_create;
+@@sql_quote_show_create
+1
+
+SET @@sql_quote_show_create = OFF;
+SELECT @@sql_quote_show_create;
+@@sql_quote_show_create
+0
+
+SET @@sql_quote_show_create = @sql_quote_show_create_saved;
+
+# End of Bug#34828.
+
 # Make sure we can manipulate with autocommit in the
 # along with other variables.
 drop table if exists t1;
diff --git a/mysql-test/suite/handler/disabled.def b/mysql-test/suite/handler/disabled.def
deleted file mode 100644
index 888298bbb09..00000000000
--- a/mysql-test/suite/handler/disabled.def
+++ /dev/null
@@ -1,11 +0,0 @@
-##############################################################################
-#
-#  List the test cases that are to be disabled temporarily.
-#
-#  Separate the test case name and the comment with ':'.
-#
-#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
-#
-#  Do not use any TAB characters for whitespace.
-#
-##############################################################################
diff --git a/mysql-test/suite/innodb/r/group_commit_crash.result b/mysql-test/suite/innodb/r/group_commit_crash.result
index 777e0c0d6ab..005049df281 100644
--- a/mysql-test/suite/innodb/r/group_commit_crash.result
+++ b/mysql-test/suite/innodb/r/group_commit_crash.result
@@ -5,15 +5,14 @@ d CHAR(255),
 id INT,
 PRIMARY KEY(id)) ENGINE=InnoDB;
 create table t2 like t1;
-create function getcrash(i INT)
-returns VARCHAR(255)
+create procedure setcrash(IN i INT)
 begin
 CASE i
-WHEN 1 THEN RETURN "crash_commit_after_prepare";
-WHEN 2 THEN RETURN "crash_commit_after_log";
-WHEN 3 THEN RETURN "crash_commit_before_unlog";
-WHEN 4 THEN RETURN "crash_commit_after";
-WHEN 5 THEN RETURN "crash_commit_before";
+WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare";
+WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log";
+WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog";
+WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after";
+WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before";
 ELSE BEGIN END;
 END CASE;
 end //
@@ -32,12 +31,9 @@ SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;
-SET @crash= getcrash(5);
-SET SESSION debug_dbug=concat("d,", @crash);
+call setcrash(5);
 COMMIT;
 Got one of the listed errors
-CRASH_POINT
-crash_commit_before
 SELECT * FROM t1 ORDER BY id;
 a	b	c	d	id
 SHOW BINLOG EVENTS LIMIT 4,1;
@@ -47,12 +43,9 @@ SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;
-SET @crash= getcrash(4);
-SET SESSION debug_dbug=concat("d,", @crash);
+call setcrash(4);
 COMMIT;
 Got one of the listed errors
-CRASH_POINT
-crash_commit_after
 SELECT * FROM t1 ORDER BY id;
 a	b	c	d	id
 a	b	c	d	1
@@ -73,12 +66,9 @@ SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;
-SET @crash= getcrash(3);
-SET SESSION debug_dbug=concat("d,", @crash);
+call setcrash(3);
 COMMIT;
 Got one of the listed errors
-CRASH_POINT
-crash_commit_before_unlog
 SELECT * FROM t1 ORDER BY id;
 a	b	c	d	id
 a	b	c	d	1
@@ -99,12 +89,9 @@ SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;
-SET @crash= getcrash(2);
-SET SESSION debug_dbug=concat("d,", @crash);
+call setcrash(2);
 COMMIT;
 Got one of the listed errors
-CRASH_POINT
-crash_commit_after_log
 SELECT * FROM t1 ORDER BY id;
 a	b	c	d	id
 a	b	c	d	1
@@ -125,12 +112,9 @@ SET binlog_format= mixed;
 RESET MASTER;
 START TRANSACTION;
 insert into t1 select * from t2;
-SET @crash= getcrash(1);
-SET SESSION debug_dbug=concat("d,", @crash);
+call setcrash(1);
 COMMIT;
 Got one of the listed errors
-CRASH_POINT
-crash_commit_after_prepare
 SELECT * FROM t1 ORDER BY id;
 a	b	c	d	id
 SHOW BINLOG EVENTS LIMIT 4,1;
@@ -138,4 +122,4 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 delete from t1;
 DROP TABLE t1;
 DROP TABLE t2;
-DROP FUNCTION getcrash;
+DROP PROCEDURE setcrash;
diff --git a/mysql-test/suite/innodb/t/group_commit_crash.test b/mysql-test/suite/innodb/t/group_commit_crash.test
index dcaa5d67191..12f7ba202e3 100644
--- a/mysql-test/suite/innodb/t/group_commit_crash.test
+++ b/mysql-test/suite/innodb/t/group_commit_crash.test
@@ -17,15 +17,14 @@ CREATE TABLE t1(a CHAR(255),
                 PRIMARY KEY(id)) ENGINE=InnoDB;
 create table t2 like t1;
 delimiter //;
-create function getcrash(i INT)
-returns VARCHAR(255)
+create procedure setcrash(IN i INT)
 begin
   CASE i
-    WHEN 1 THEN RETURN "crash_commit_after_prepare";
-    WHEN 2 THEN RETURN "crash_commit_after_log";
-    WHEN 3 THEN RETURN "crash_commit_before_unlog";
-    WHEN 4 THEN RETURN "crash_commit_after";
-    WHEN 5 THEN RETURN "crash_commit_before";
+    WHEN 1 THEN SET SESSION debug_dbug="d,crash_commit_after_prepare";
+    WHEN 2 THEN SET SESSION debug_dbug="d,crash_commit_after_log";
+    WHEN 3 THEN SET SESSION debug_dbug="d,crash_commit_before_unlog";
+    WHEN 4 THEN SET SESSION debug_dbug="d,crash_commit_after";
+    WHEN 5 THEN SET SESSION debug_dbug="d,crash_commit_before";
     ELSE BEGIN END;
   END CASE;
 end //
@@ -54,8 +53,8 @@ while ($numtests)
   # Write file to make mysql-test-run.pl expect crash
   --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
 
-  eval SET @crash= getcrash($numtests);
-  SET SESSION debug_dbug=concat("d,", @crash);
+  eval call setcrash($numtests);
+
   # Run the crashing query
   --error 2006,2013
   COMMIT;
@@ -63,10 +62,6 @@ while ($numtests)
   # Poll the server waiting for it to be back online again.
   --source include/wait_until_connected_again.inc
 
-  --disable_query_log
-  eval SET @crash= getcrash($numtests);
-  SELECT @crash as CRASH_POINT;
-  --enable_query_log
   # table and binlog should be in sync.
   SELECT * FROM t1 ORDER BY id;
 --replace_column 2 # 5 #
@@ -80,4 +75,4 @@ while ($numtests)
 # final cleanup
 DROP TABLE t1;
 DROP TABLE t2;
-DROP FUNCTION getcrash;
+DROP PROCEDURE setcrash;
diff --git a/mysql-test/suite/sys_vars/r/delay_key_write_basic.result b/mysql-test/suite/sys_vars/r/delay_key_write_basic.result
index 7299737f63b..2258d7af078 100644
--- a/mysql-test/suite/sys_vars/r/delay_key_write_basic.result
+++ b/mysql-test/suite/sys_vars/r/delay_key_write_basic.result
@@ -37,8 +37,8 @@ SET @@global.delay_key_write = FALSE0;
 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 = OFFF;
-ERROR 42000: Variable 'delay_key_write' can't be set to the value of 'OFFF'
+SET @@global.delay_key_write = OF;
+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 = "";
diff --git a/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
index f33ef34a62a..834d693edb8 100644
--- a/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
+++ b/mysql-test/suite/sys_vars/r/foreign_key_checks_basic.result
@@ -43,8 +43,8 @@ SET @@session.foreign_key_checks = TR
 ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'TRÜE'
 SET @@session.foreign_key_checks = ÕN;
 ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'ÕN'
-SET @@session.foreign_key_checks = OFFF;
-ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'OFFF'
+SET @@session.foreign_key_checks = OF;
+ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'OF'
 SET @@session.foreign_key_checks = ÓFF;
 ERROR 42000: Variable 'foreign_key_checks' can't be set to the value of 'ÓFF'
 SET @@session.foreign_key_checks = '¹';
diff --git a/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
index aec529aece2..08dc5d7aaca 100644
--- a/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_table_locks_basic.result
@@ -66,7 +66,7 @@ SET @@session.innodb_table_locks = TR
 ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'TRÜE'
 SET @@session.innodb_table_locks = ÕN;
 ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'ÕN'
-SET @@session.innodb_table_locks = OFF;
+SET @@session.innodb_table_locks = OF;
 SELECT @@session.innodb_table_locks;
 @@session.innodb_table_locks
 0
@@ -84,7 +84,7 @@ SET @@global.innodb_table_locks = TR
 ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'TRÜE'
 SET @@global.innodb_table_locks = QN;
 ERROR 42000: Variable 'innodb_table_locks' can't be set to the value of 'QN'
-SET @@global.innodb_table_locks = OFF;
+SET @@global.innodb_table_locks = OF;
 SELECT @@global.innodb_table_locks;
 @@global.innodb_table_locks
 0
diff --git a/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
index 8e9f7308b73..b7deea88a9c 100644
--- a/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
+++ b/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
@@ -101,8 +101,8 @@ SET @@session.keep_files_on_create = ONN;
 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 = OFFF;
-ERROR 42000: Variable 'keep_files_on_create' can't be set to the value of 'OFFF'
+SET @@session.keep_files_on_create = OF;
+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;
diff --git a/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
index d3d2e97d249..7ed1b689f5a 100644
--- a/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_bin_trust_function_creators_basic.result
@@ -50,8 +50,8 @@ SET @@global.log_bin_trust_function_creators = 'ONN';
 ERROR 42000: Variable 'log_bin_trust_function_creators' can't be set to the value of 'ONN'
 SET @@global.log_bin_trust_function_creators = "OFFF";
 ERROR 42000: Variable 'log_bin_trust_function_creators' can't be set to the value of 'OFFF'
-SET @@global.log_bin_trust_function_creators = OFFF;
-ERROR 42000: Variable 'log_bin_trust_function_creators' can't be set to the value of 'OFFF'
+SET @@global.log_bin_trust_function_creators = OF;
+ERROR 42000: Variable 'log_bin_trust_function_creators' can't be set to the value of 'OF'
 SET @@global.log_bin_trust_function_creators = TTRUE;
 ERROR 42000: Variable 'log_bin_trust_function_creators' can't be set to the value of 'TTRUE'
 SET @@global.log_bin_trust_function_creators = FELSE;
diff --git a/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
index 9e514c8cb35..633dc274dec 100644
--- a/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
+++ b/mysql-test/suite/sys_vars/r/low_priority_updates_basic.result
@@ -101,8 +101,8 @@ SET @@session.low_priority_updates = ONN;
 ERROR 42000: Variable 'low_priority_updates' can't be set to the value of 'ONN'
 SET @@session.low_priority_updates = ONF;
 ERROR 42000: Variable 'low_priority_updates' can't be set to the value of 'ONF'
-SET @@session.low_priority_updates = OFFF;
-ERROR 42000: Variable 'low_priority_updates' can't be set to the value of 'OFFF'
+SET @@session.low_priority_updates = OF;
+ERROR 42000: Variable 'low_priority_updates' can't be set to the value of 'OF'
 SET @@session.low_priority_updates = 'OFN';
 ERROR 42000: Variable 'low_priority_updates' can't be set to the value of 'OFN'
 SET @@session.low_priority_updates = -2;
diff --git a/mysql-test/suite/sys_vars/r/old_passwords_basic.result b/mysql-test/suite/sys_vars/r/old_passwords_basic.result
index dba84b18b11..26d0e79071b 100644
--- a/mysql-test/suite/sys_vars/r/old_passwords_basic.result
+++ b/mysql-test/suite/sys_vars/r/old_passwords_basic.result
@@ -97,8 +97,8 @@ SET @@session.old_passwords = ONN;
 ERROR 42000: Variable 'old_passwords' can't be set to the value of 'ONN'
 SET @@session.old_passwords = ONF;
 ERROR 42000: Variable 'old_passwords' can't be set to the value of 'ONF'
-SET @@session.old_passwords = OFFF;
-ERROR 42000: Variable 'old_passwords' can't be set to the value of 'OFFF'
+SET @@session.old_passwords = OF;
+ERROR 42000: Variable 'old_passwords' can't be set to the value of 'OF'
 SET @@session.old_passwords = 'OFN';
 ERROR 42000: Variable 'old_passwords' can't be set to the value of 'OFN'
 SET @@session.old_passwords = -2;
diff --git a/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
index c22107292cd..99843f0b93f 100644
--- a/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
+++ b/mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
@@ -104,7 +104,7 @@ SET @@session.optimizer_prune_level = ONF;
 ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level'
 SET @@session.optimizer_prune_level = ON;
 ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level'
-SET @@session.optimizer_prune_level = OFFF;
+SET @@session.optimizer_prune_level = OF;
 ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level'
 SET @@session.optimizer_prune_level = 'OFN';
 ERROR 42000: Incorrect argument type to variable 'optimizer_prune_level'
diff --git a/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result b/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result
index cec880bf1d5..c98dd338909 100644
--- a/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result
+++ b/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result
@@ -58,8 +58,8 @@ SET @@session.pseudo_slave_mode = TR
 ERROR 42000: Variable 'pseudo_slave_mode' can't be set to the value of 'TRÜE'
 SET @@session.pseudo_slave_mode = ÕN;
 ERROR 42000: Variable 'pseudo_slave_mode' can't be set to the value of 'ÕN'
-SET @@session.pseudo_slave_mode = OFFF;
-ERROR 42000: Variable 'pseudo_slave_mode' can't be set to the value of 'OFFF'
+SET @@session.pseudo_slave_mode = OF;
+ERROR 42000: Variable 'pseudo_slave_mode' can't be set to the value of 'OF'
 SET @@session.pseudo_slave_mode = ÓFF;
 ERROR 42000: Variable 'pseudo_slave_mode' can't be set to the value of 'ÓFF'
 SET @@session.pseudo_slave_mode = '¹';
diff --git a/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
index 26169b4b979..96f42bbbda3 100644
--- a/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
+++ b/mysql-test/suite/sys_vars/r/query_cache_wlock_invalidate_basic.result
@@ -66,8 +66,8 @@ SET @@session.query_cache_wlock_invalidate = TR
 ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'TRÜE'
 SET @@session.query_cache_wlock_invalidate = ÕN;
 ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'ÕN'
-SET @@session.query_cache_wlock_invalidate = OFFF;
-ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'OFFF'
+SET @@session.query_cache_wlock_invalidate = OF;
+ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'OF'
 SET @@session.query_cache_wlock_invalidate = ÓFF;
 ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'ÓFF'
 SET @@global.query_cache_wlock_invalidate = -1;
@@ -82,8 +82,8 @@ SET @@global.query_cache_wlock_invalidate = TR
 ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'TRÜE'
 SET @@global.query_cache_wlock_invalidate = ÕN;
 ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'ÕN'
-SET @@global.query_cache_wlock_invalidate = OFFF;
-ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'OFFF'
+SET @@global.query_cache_wlock_invalidate = OF;
+ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'OF'
 SET @@global.query_cache_wlock_invalidate = ÓFF;
 ERROR 42000: Variable 'query_cache_wlock_invalidate' can't be set to the value of 'ÓFF'
 '#-------------------FN_DYNVARS_135_05----------------------------#'
diff --git a/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result b/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
index fc16ecc06f2..98f05bda488 100644
--- a/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_big_selects_basic.result
@@ -43,8 +43,8 @@ SET @@session.sql_big_selects = TR
 ERROR 42000: Variable 'sql_big_selects' can't be set to the value of 'TRÜE'
 SET @@session.sql_big_selects = ÕN;
 ERROR 42000: Variable 'sql_big_selects' can't be set to the value of 'ÕN'
-SET @@session.sql_big_selects = OFFF;
-ERROR 42000: Variable 'sql_big_selects' can't be set to the value of 'OFFF'
+SET @@session.sql_big_selects = OF;
+ERROR 42000: Variable 'sql_big_selects' can't be set to the value of 'OF'
 SET @@session.sql_big_selects = ÓFF;
 ERROR 42000: Variable 'sql_big_selects' can't be set to the value of 'ÓFF'
 SET @@session.sql_big_selects = '¹';
diff --git a/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result b/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
index 91081a78328..09553ae7d57 100644
--- a/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
@@ -48,7 +48,7 @@ SET @@session.sql_big_tables = TR
 ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'TRÜE'
 SET @@session.sql_big_tables = ÕN;
 ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'ÕN'
-SET @@session.sql_big_tables = OFFF;
+SET @@session.sql_big_tables = OF;
 ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'OF'
 SET @@session.sql_big_tables = ÓFF;
 ERROR 42000: Variable 'sql_big_tables' can't be set to the value of 'ÓFF'
diff --git a/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result b/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
index 83597ef47cb..2dfdcb26898 100644
--- a/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_buffer_result_basic.result
@@ -48,8 +48,8 @@ SET @@session.sql_buffer_result = TR
 ERROR 42000: Variable 'sql_buffer_result' can't be set to the value of 'TRÜE'
 SET @@session.sql_buffer_result = ÕN;
 ERROR 42000: Variable 'sql_buffer_result' can't be set to the value of 'ÕN'
-SET @@session.sql_buffer_result = OFFF;
-ERROR 42000: Variable 'sql_buffer_result' can't be set to the value of 'OFFF'
+SET @@session.sql_buffer_result = OF;
+ERROR 42000: Variable 'sql_buffer_result' can't be set to the value of 'OF'
 SET @@session.sql_buffer_result = ÓFF;
 ERROR 42000: Variable 'sql_buffer_result' can't be set to the value of 'ÓFF'
 SET @@session.sql_buffer_result = '¹';
diff --git a/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result b/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
index a909019fc50..909c434340c 100644
--- a/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
@@ -48,8 +48,8 @@ SET @@session.sql_log_bin = TR
 ERROR 42000: Variable 'sql_log_bin' can't be set to the value of 'TRÜE'
 SET @@session.sql_log_bin = ÕN;
 ERROR 42000: Variable 'sql_log_bin' can't be set to the value of 'ÕN'
-SET @@session.sql_log_bin = OFFF;
-ERROR 42000: Variable 'sql_log_bin' can't be set to the value of 'OFFF'
+SET @@session.sql_log_bin = OF;
+ERROR 42000: Variable 'sql_log_bin' can't be set to the value of 'OF'
 SET @@session.sql_log_bin = ÓFF;
 ERROR 42000: Variable 'sql_log_bin' can't be set to the value of 'ÓFF'
 SET @@session.sql_log_bin = '¹';
diff --git a/mysql-test/suite/sys_vars/r/sql_log_off_basic.result b/mysql-test/suite/sys_vars/r/sql_log_off_basic.result
index 0cb5b576127..c2ffa17c5fe 100644
--- a/mysql-test/suite/sys_vars/r/sql_log_off_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_log_off_basic.result
@@ -48,8 +48,8 @@ SET @@session.sql_log_off = TR
 ERROR 42000: Variable 'sql_log_off' can't be set to the value of 'TRÜE'
 SET @@session.sql_log_off = ÕN;
 ERROR 42000: Variable 'sql_log_off' can't be set to the value of 'ÕN'
-SET @@session.sql_log_off = OFFF;
-ERROR 42000: Variable 'sql_log_off' can't be set to the value of 'OFFF'
+SET @@session.sql_log_off = OF;
+ERROR 42000: Variable 'sql_log_off' can't be set to the value of 'OF'
 SET @@session.sql_log_off = ÓFF;
 ERROR 42000: Variable 'sql_log_off' can't be set to the value of 'ÓFF'
 SET @@session.sql_log_off = '¹';
diff --git a/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
index ed493e038ca..28bc53e5718 100644
--- a/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
@@ -63,7 +63,7 @@ SET @@session.sql_low_priority_updates = TR
 ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'TRÜE'
 SET @@session.sql_low_priority_updates = ÕN;
 ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'ÕN'
-SET @@session.sql_low_priority_updates = OFFF;
+SET @@session.sql_low_priority_updates = OF;
 ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'OF'
 SET @@session.sql_low_priority_updates = ÓFF;
 ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'ÓFF'
@@ -79,7 +79,7 @@ SET @@global.sql_low_priority_updates = TR
 ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'TRÜE'
 SET @@global.sql_low_priority_updates = ÕN;
 ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'ÕN'
-SET @@global.sql_low_priority_updates = OFFF;
+SET @@global.sql_low_priority_updates = OF;
 ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'OF'
 SET @@global.sql_low_priority_updates = ÓFF;
 ERROR 42000: Variable 'sql_low_priority_updates' can't be set to the value of 'ÓFF'
diff --git a/mysql-test/suite/sys_vars/r/sql_notes_basic.result b/mysql-test/suite/sys_vars/r/sql_notes_basic.result
index 18a846874ab..7a54f90f8b7 100644
--- a/mysql-test/suite/sys_vars/r/sql_notes_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_notes_basic.result
@@ -48,8 +48,8 @@ SET @@session.sql_notes = TR
 ERROR 42000: Variable 'sql_notes' can't be set to the value of 'TRÜE'
 SET @@session.sql_notes = ÕN;
 ERROR 42000: Variable 'sql_notes' can't be set to the value of 'ÕN'
-SET @@session.sql_notes = OFFF;
-ERROR 42000: Variable 'sql_notes' can't be set to the value of 'OFFF'
+SET @@session.sql_notes = OF;
+ERROR 42000: Variable 'sql_notes' can't be set to the value of 'OF'
 SET @@session.sql_notes = ÓFF;
 ERROR 42000: Variable 'sql_notes' can't be set to the value of 'ÓFF'
 SET @@session.sql_notes = '¹';
diff --git a/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result b/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
index 97715ae2089..8cf99233ef9 100644
--- a/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
@@ -48,8 +48,8 @@ SET @@session.sql_quote_show_create = TR
 ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE'
 SET @@session.sql_quote_show_create = ÕN;
 ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'ÕN'
-SET @@session.sql_quote_show_create = OFFF;
-ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'OFFF'
+SET @@session.sql_quote_show_create = OF;
+ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'OF'
 SET @@session.sql_quote_show_create = ÓFF;
 ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'ÓFF'
 SET @@session.sql_quote_show_create = '¹';
diff --git a/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result b/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
index 4bdcc8f6b47..91bfcb2377e 100644
--- a/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_safe_updates_basic.result
@@ -48,8 +48,8 @@ SET @@session.sql_safe_updates = TR
 ERROR 42000: Variable 'sql_safe_updates' can't be set to the value of 'TRÜE'
 SET @@session.sql_safe_updates = ÕN;
 ERROR 42000: Variable 'sql_safe_updates' can't be set to the value of 'ÕN'
-SET @@session.sql_safe_updates = OFFF;
-ERROR 42000: Variable 'sql_safe_updates' can't be set to the value of 'OFFF'
+SET @@session.sql_safe_updates = OF;
+ERROR 42000: Variable 'sql_safe_updates' can't be set to the value of 'OF'
 SET @@session.sql_safe_updates = ÓFF;
 ERROR 42000: Variable 'sql_safe_updates' can't be set to the value of 'ÓFF'
 SET @@session.sql_safe_updates = '¹';
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 f9cae0c7f7a..762182336c3 100644
--- a/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
+++ b/mysql-test/suite/sys_vars/r/sql_warnings_basic.result
@@ -46,8 +46,8 @@ SET @@session.sql_warnings = TR
 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'
-SET @@session.sql_warnings = OFFF;
-ERROR 42000: Variable 'sql_warnings' can't be set to the value of 'OFFF'
+SET @@session.sql_warnings = OF;
+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'
 SET @@session.sql_warnings = '¹';
diff --git a/mysql-test/suite/sys_vars/r/tx_read_only_basic.result b/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
index e8f5da31c5a..3750145083f 100644
--- a/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
+++ b/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
@@ -102,8 +102,8 @@ SET @@session.tx_read_only = ONN;
 ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'ONN'
 SET @@session.tx_read_only = ONF;
 ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'ONF'
-SET @@session.tx_read_only = OFFF;
-ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'OFFF'
+SET @@session.tx_read_only = OF;
+ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'OF'
 SET @@session.tx_read_only = 'OFN';
 ERROR 42000: Variable 'tx_read_only' can't be set to the value of 'OFN'
 SET @@session.tx_read_only = -2;
diff --git a/mysql-test/suite/sys_vars/t/delay_key_write_basic.test b/mysql-test/suite/sys_vars/t/delay_key_write_basic.test
index 2856993cb6c..25176879eb1 100644
--- a/mysql-test/suite/sys_vars/t/delay_key_write_basic.test
+++ b/mysql-test/suite/sys_vars/t/delay_key_write_basic.test
@@ -90,7 +90,7 @@ SET @@global.delay_key_write = FALSE0;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.delay_key_write = ONN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.delay_key_write = OFFF;
+SET @@global.delay_key_write = OF;
 
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.delay_key_write = ' ';
diff --git a/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test b/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
index b1fc9997cfa..8a327ab699b 100644
--- a/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
+++ b/mysql-test/suite/sys_vars/t/foreign_key_checks_basic.test
@@ -94,7 +94,7 @@ SET @@session.foreign_key_checks = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.foreign_key_checks = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.foreign_key_checks = OFFF;
+SET @@session.foreign_key_checks = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.foreign_key_checks = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test b/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
index 25be5daa552..e3e4bda345e 100644
--- a/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
+++ b/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
@@ -119,7 +119,7 @@ SET @@session.innodb_table_locks = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.innodb_table_locks = ÕN;
 
-SET @@session.innodb_table_locks = OFF;
+SET @@session.innodb_table_locks = OF;
 SELECT @@session.innodb_table_locks;
 
 --Error ER_WRONG_VALUE_FOR_VAR
@@ -141,7 +141,7 @@ SET @@global.innodb_table_locks = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.innodb_table_locks = QN;
 
-SET @@global.innodb_table_locks = OFF;
+SET @@global.innodb_table_locks = OF;
 SELECT @@global.innodb_table_locks;
 
 --Error ER_WRONG_TYPE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test b/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
index cfa50e72146..e6141af4bbe 100644
--- a/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
+++ b/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
@@ -132,7 +132,7 @@ SET @@session.keep_files_on_create = ONN;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.keep_files_on_create = ONF;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.keep_files_on_create = OFFF;
+SET @@session.keep_files_on_create = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.keep_files_on_create = 'OFN';
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
index 1db6bf41e6f..15ffad2742a 100644
--- a/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
+++ b/mysql-test/suite/sys_vars/t/log_bin_trust_function_creators_basic.test
@@ -96,7 +96,7 @@ SET @@global.log_bin_trust_function_creators = 'ONN';
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.log_bin_trust_function_creators = "OFFF";
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.log_bin_trust_function_creators = OFFF;
+SET @@global.log_bin_trust_function_creators = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.log_bin_trust_function_creators = TTRUE;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test b/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
index 703036b8e36..e00688ef974 100644
--- a/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
+++ b/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
@@ -132,7 +132,7 @@ SET @@session.low_priority_updates = ONN;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.low_priority_updates = ONF;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.low_priority_updates = OFFF;
+SET @@session.low_priority_updates = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.low_priority_updates = 'OFN';
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/old_passwords_basic.test b/mysql-test/suite/sys_vars/t/old_passwords_basic.test
index 038a77edf8f..f4965ad7528 100644
--- a/mysql-test/suite/sys_vars/t/old_passwords_basic.test
+++ b/mysql-test/suite/sys_vars/t/old_passwords_basic.test
@@ -131,7 +131,7 @@ SET @@session.old_passwords = ONN;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.old_passwords = ONF;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.old_passwords = OFFF;
+SET @@session.old_passwords = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.old_passwords = 'OFN';
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test b/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test
index 374be2db6ae..1e3a8bc3d7f 100644
--- a/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test
+++ b/mysql-test/suite/sys_vars/t/optimizer_prune_level_basic.test
@@ -140,7 +140,7 @@ SET @@session.optimizer_prune_level = ONF;
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@session.optimizer_prune_level = ON;
 --Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.optimizer_prune_level = OFFF;
+SET @@session.optimizer_prune_level = OF;
 
 --Error ER_WRONG_TYPE_FOR_VAR
 SET @@session.optimizer_prune_level = 'OFN';
diff --git a/mysql-test/suite/sys_vars/t/pseudo_slave_mode_basic.test b/mysql-test/suite/sys_vars/t/pseudo_slave_mode_basic.test
index 6d1dca299c6..3ef39bb8667 100644
--- a/mysql-test/suite/sys_vars/t/pseudo_slave_mode_basic.test
+++ b/mysql-test/suite/sys_vars/t/pseudo_slave_mode_basic.test
@@ -97,7 +97,7 @@ SET @@session.pseudo_slave_mode = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.pseudo_slave_mode = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.pseudo_slave_mode = OFFF;
+SET @@session.pseudo_slave_mode = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.pseudo_slave_mode = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
index c883d9b789a..055c3629d15 100644
--- a/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
+++ b/mysql-test/suite/sys_vars/t/query_cache_wlock_invalidate_basic.test
@@ -116,7 +116,7 @@ SET @@session.query_cache_wlock_invalidate = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.query_cache_wlock_invalidate = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.query_cache_wlock_invalidate = OFFF;
+SET @@session.query_cache_wlock_invalidate = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.query_cache_wlock_invalidate = ÓFF;
 
@@ -135,7 +135,7 @@ SET @@global.query_cache_wlock_invalidate = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.query_cache_wlock_invalidate = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@global.query_cache_wlock_invalidate = OFFF;
+SET @@global.query_cache_wlock_invalidate = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.query_cache_wlock_invalidate = ÓFF;
 
diff --git a/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test b/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
index 52345b71144..42331d766be 100644
--- a/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_big_selects_basic.test
@@ -94,7 +94,7 @@ SET @@session.sql_big_selects = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_big_selects = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_big_selects = OFFF;
+SET @@session.sql_big_selects = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_big_selects = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test b/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
index 2475bd9cd8a..f5f99efeb0a 100644
--- a/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_buffer_result_basic.test
@@ -100,7 +100,7 @@ SET @@session.sql_buffer_result = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_buffer_result = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_buffer_result = OFFF;
+SET @@session.sql_buffer_result = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_buffer_result = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test b/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
index 7e133200d5f..5f5e3920862 100644
--- a/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
@@ -98,7 +98,7 @@ SET @@session.sql_log_bin = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_log_bin = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_log_bin = OFFF;
+SET @@session.sql_log_bin = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_log_bin = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/sql_log_off_basic.test b/mysql-test/suite/sys_vars/t/sql_log_off_basic.test
index a48d3bbfda6..38549ac35d2 100644
--- a/mysql-test/suite/sys_vars/t/sql_log_off_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_log_off_basic.test
@@ -97,7 +97,7 @@ SET @@session.sql_log_off = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_log_off = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_log_off = OFFF;
+SET @@session.sql_log_off = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_log_off = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/sql_notes_basic.test b/mysql-test/suite/sys_vars/t/sql_notes_basic.test
index 204ebe3fe84..9af5fa35ea2 100644
--- a/mysql-test/suite/sys_vars/t/sql_notes_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_notes_basic.test
@@ -99,7 +99,7 @@ SET @@session.sql_notes = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_notes = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_notes = OFFF;
+SET @@session.sql_notes = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_notes = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test b/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
index 8e8118b998b..020b5f51e9f 100644
--- a/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
@@ -98,7 +98,7 @@ SET @@session.sql_quote_show_create = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_quote_show_create = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_quote_show_create = OFFF;
+SET @@session.sql_quote_show_create = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_quote_show_create = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test b/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
index 89208cae0ef..66148b65aaf 100644
--- a/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_safe_updates_basic.test
@@ -97,7 +97,7 @@ SET @@session.sql_safe_updates = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_safe_updates = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_safe_updates = OFFF;
+SET @@session.sql_safe_updates = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_safe_updates = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/sql_warnings_basic.test b/mysql-test/suite/sys_vars/t/sql_warnings_basic.test
index f32b6f33f89..ced58f96e15 100644
--- a/mysql-test/suite/sys_vars/t/sql_warnings_basic.test
+++ b/mysql-test/suite/sys_vars/t/sql_warnings_basic.test
@@ -98,7 +98,7 @@ SET @@session.sql_warnings = TR
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_warnings = ÕN;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.sql_warnings = OFFF;
+SET @@session.sql_warnings = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.sql_warnings = ÓFF;
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/suite/sys_vars/t/tx_read_only_basic.test b/mysql-test/suite/sys_vars/t/tx_read_only_basic.test
index 8c6ab0e3d59..0ebfcc31a89 100644
--- a/mysql-test/suite/sys_vars/t/tx_read_only_basic.test
+++ b/mysql-test/suite/sys_vars/t/tx_read_only_basic.test
@@ -116,7 +116,7 @@ SET @@session.tx_read_only = ONN;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.tx_read_only = ONF;
 --Error ER_WRONG_VALUE_FOR_VAR
-SET @@session.tx_read_only = OFFF;
+SET @@session.tx_read_only = OF;
 --Error ER_WRONG_VALUE_FOR_VAR
 SET @@session.tx_read_only = 'OFN';
 --Error ER_WRONG_VALUE_FOR_VAR
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 67082fd48ff..8d831567252 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -1295,6 +1295,166 @@ DROP TABLE t1;
 
 --echo End of 5.1 tests
 
+###########################################################################
+
+--echo
+--echo #
+--echo # Bug#34828: OF is taken as OFF and a value of 0 is set for variable SQL_notes.
+--echo #
+--echo
+
+--echo # Checking sql_notes...
+SET @sql_notes_saved = @@sql_notes;
+
+--echo
+SET @@sql_notes = ON;
+SELECT @@sql_notes;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@sql_notes = OF;
+SELECT @@sql_notes;
+
+--echo
+SET @@sql_notes = OFF;
+SELECT @@sql_notes;
+
+--echo
+SET @@sql_notes = @sql_notes_saved;
+
+--echo
+--echo # Checking delay_key_write...
+SET @delay_key_write_saved = @@delay_key_write;
+
+--echo
+SET GLOBAL delay_key_write = ON;
+SELECT @@delay_key_write;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL delay_key_write = OF;
+SELECT @@delay_key_write;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET GLOBAL delay_key_write = AL;
+SELECT @@delay_key_write;
+
+--echo
+SET GLOBAL delay_key_write = OFF;
+SELECT @@delay_key_write;
+
+--echo
+SET GLOBAL delay_key_write = ALL;
+SELECT @@delay_key_write;
+
+--echo
+SET GLOBAL delay_key_write = @delay_key_write_saved;
+
+--echo
+--echo # Checking sql_safe_updates...
+SET @sql_safe_updates_saved = @@sql_safe_updates;
+
+--echo
+SET @@sql_safe_updates = ON;
+SELECT @@sql_safe_updates;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@sql_safe_updates = OF;
+SELECT @@sql_safe_updates;
+
+--echo
+SET @@sql_safe_updates = OFF;
+SELECT @@sql_safe_updates;
+
+--echo
+SET @@sql_safe_updates = @sql_safe_updates_saved;
+
+--echo
+--echo # Checking foreign_key_checks...
+SET @foreign_key_checks_saved = @@foreign_key_checks;
+
+--echo
+SET @@foreign_key_checks = ON;
+SELECT @@foreign_key_checks;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@foreign_key_checks = OF;
+SELECT @@foreign_key_checks;
+
+--echo
+SET @@foreign_key_checks = OFF;
+SELECT @@foreign_key_checks;
+
+--echo
+SET @@foreign_key_checks = @foreign_key_checks_saved;
+
+--echo
+--echo # Checking unique_checks...
+SET @unique_checks_saved = @@unique_checks;
+
+--echo
+SET @@unique_checks = ON;
+SELECT @@unique_checks;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@unique_checks = OF;
+SELECT @@unique_checks;
+
+--echo
+SET @@unique_checks = OFF;
+SELECT @@unique_checks;
+
+--echo
+SET @@unique_checks = @unique_checks_saved;
+
+--echo
+--echo # Checking sql_buffer_result...
+SET @sql_buffer_result_saved = @@sql_buffer_result;
+
+--echo
+SET @@sql_buffer_result = ON;
+SELECT @@sql_buffer_result;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@sql_buffer_result = OF;
+SELECT @@sql_buffer_result;
+
+--echo
+SET @@sql_buffer_result = OFF;
+SELECT @@sql_buffer_result;
+
+--echo
+SET @@sql_buffer_result = @sql_buffer_result_saved;
+
+--echo
+--echo # Checking sql_quote_show_create...
+SET @sql_quote_show_create_saved = @@sql_quote_show_create;
+
+--echo
+SET @@sql_quote_show_create = ON;
+SELECT @@sql_quote_show_create;
+
+--echo
+--error ER_WRONG_VALUE_FOR_VAR
+SET @@sql_quote_show_create = OF;
+SELECT @@sql_quote_show_create;
+
+--echo
+SET @@sql_quote_show_create = OFF;
+SELECT @@sql_quote_show_create;
+
+--echo
+SET @@sql_quote_show_create = @sql_quote_show_create_saved;
+
+--echo
+--echo # End of Bug#34828.
+--echo
+
 --echo # Make sure we can manipulate with autocommit in the
 --echo # along with other variables.