BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER

QUOTING IN REPLICATION Problem: Misquoting or unquoted identifiers may lead to incorrect statements to be logged to the binary log. Fix: we use specialized functions to append quoted identifiers in the statements generated by the server.
2025-08-01 03:47:19 +03:00 · 2012-09-22 17:50:51 +05:30
parent f820334bbf
commit 5530c5e38d
23 changed files with 830 additions and 660 deletions
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@ -18,7 +18,7 @@ flush logs;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -64,7 +64,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -97,7 +97,7 @@ Warning: The option '--position' is deprecated and will be removed in a future r
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -119,7 +119,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -165,7 +165,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -198,7 +198,7 @@ Warning: The option '--position' is deprecated and will be removed in a future r
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -220,7 +220,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1108844556/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
@ -239,7 +239,7 @@ Warning: The option '--position' is deprecated and will be removed in a future r
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1108844556/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
@ -299,7 +299,7 @@ ERROR 42000: PROCEDURE test.p1 does not exist
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -349,7 +349,7 @@ flush logs;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -484,7 +484,7 @@ FLUSH LOGS;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1253783037/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -581,22 +581,22 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 SavePoint mixed_cases
 /*!*/;
-use db1/*!*/;
+use `db1`/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 INSERT INTO db1.t2 VALUES("in savepoint mixed_cases")
 /*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 INSERT INTO db1.t1 VALUES(40)
 /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 ROLLBACK TO mixed_cases
 /*!*/;
-use db1/*!*/;
+use `db1`/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 INSERT INTO db1.t2 VALUES("after rollback to")
 /*!*/;
@ -624,7 +624,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 BEGIN
 /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1266652094/*!*/;
 SavePoint mixed_cases
 /*!*/;
--- a/mysql-test/r/mysqlbinlog2.result
+++ b/mysql-test/r/mysqlbinlog2.result
@ -19,7 +19,7 @@ insert into t1 values(null, "f");
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -62,7 +62,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=1/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -101,7 +101,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=4/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609946/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -127,7 +127,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -162,7 +162,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=4/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609946/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -185,7 +185,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=3/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609944/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -215,7 +215,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -246,7 +246,7 @@ flush logs;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -281,7 +281,7 @@ insert into t1 values(null, "e")
 DELIMITER ;
 DELIMITER /*!*/;
 SET INSERT_ID=6/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609943/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -304,7 +304,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=1/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -335,7 +335,7 @@ insert into t1 values(null, "e")
 DELIMITER ;
 DELIMITER /*!*/;
 SET INSERT_ID=6/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609943/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -358,7 +358,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=4/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609946/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -377,7 +377,7 @@ insert into t1 values(null, "e")
 DELIMITER ;
 DELIMITER /*!*/;
 SET INSERT_ID=6/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609943/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -399,7 +399,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -445,7 +445,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=3/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609944/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -468,7 +468,7 @@ insert into t1 values(null, "e")
 DELIMITER ;
 DELIMITER /*!*/;
 SET INSERT_ID=6/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609943/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -490,7 +490,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -520,7 +520,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -563,7 +563,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=1/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -601,7 +601,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 SET INSERT_ID=4/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609946/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -627,7 +627,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -661,7 +661,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 SET INSERT_ID=4/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609946/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -684,7 +684,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=3/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609944/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -714,7 +714,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -744,7 +744,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -779,7 +779,7 @@ insert into t1 values(null, "e")
 DELIMITER ;
 DELIMITER /*!*/;
 SET INSERT_ID=6/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609943/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -802,7 +802,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=1/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -833,7 +833,7 @@ insert into t1 values(null, "e")
 DELIMITER ;
 DELIMITER /*!*/;
 SET INSERT_ID=6/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609943/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -855,7 +855,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 SET INSERT_ID=4/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609946/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -874,7 +874,7 @@ insert into t1 values(null, "e")
 DELIMITER ;
 DELIMITER /*!*/;
 SET INSERT_ID=6/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609943/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -896,7 +896,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -942,7 +942,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET INSERT_ID=3/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609944/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -965,7 +965,7 @@ insert into t1 values(null, "e")
 DELIMITER ;
 DELIMITER /*!*/;
 SET INSERT_ID=6/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609943/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -987,7 +987,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -1017,7 +1017,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1579609942/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
--- a/mysql-test/r/mysqlbinlog_row.result
+++ b/mysql-test/r/mysqlbinlog_row.result
--- a/mysql-test/r/mysqlbinlog_row_innodb.result
+++ b/mysql-test/r/mysqlbinlog_row_innodb.result
@ -2253,7 +2253,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -2363,7 +2363,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=b'0' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'0000000000000000000000000000000000000000000000000000000000000000' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -2456,7 +2456,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -2551,7 +2551,7 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
 ###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
@ -2632,7 +2632,7 @@ BEGIN
 ###   @77=NULL /* TIMESTAMP meta=63233 nullable=1 is_null=1 */
 ###   @78=NULL /* TIMESTAMP meta=63489 nullable=1 is_null=1 */
 ###   @79=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -2725,7 +2725,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=b'0' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'0000000000000000000000000000000000000000000000000000000000000000' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -2898,7 +2898,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3071,7 +3071,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
 ###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
@ -3244,7 +3244,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3417,7 +3417,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3510,7 +3510,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=b'0' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'0000000000000000000000000000000000000000000000000000000000000000' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3603,7 +3603,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3696,7 +3696,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
 ###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
@ -3876,7 +3876,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -3901,47 +3901,47 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=1 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-04' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-05' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-06' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-07' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:08' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-08' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=8 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:09' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-09' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -3958,7 +3958,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -3967,7 +3967,7 @@ BEGIN
 ###   @1='2008:08:11' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=1 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -3976,7 +3976,7 @@ BEGIN
 ###   @1='2008:08:12' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -3985,7 +3985,7 @@ BEGIN
 ###   @1='2008:08:13' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-04' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -3994,7 +3994,7 @@ BEGIN
 ###   @1='2008:08:14' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-04' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-05' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4003,7 +4003,7 @@ BEGIN
 ###   @1='2008:08:15' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-05' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-06' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4012,7 +4012,7 @@ BEGIN
 ###   @1='2008:08:16' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-06' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-07' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4033,37 +4033,37 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:11' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=1 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:12' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:13' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:14' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-04' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:15' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-05' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:16' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-06' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:17' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-07' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4243,7 +4243,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -4286,47 +4286,47 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-01' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=11 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:08' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-08' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=18 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:09' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4343,47 +4343,47 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-01' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=21 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:08' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-08' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=28 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:09' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4400,47 +4400,47 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-01' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=31 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:08' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-08' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=38 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:09' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4465,7 +4465,7 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4474,7 +4474,7 @@ BEGIN
 ###   @1='2018:01:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4483,7 +4483,7 @@ BEGIN
 ###   @1='2018:01:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4492,7 +4492,7 @@ BEGIN
 ###   @1='2018:01:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4501,7 +4501,7 @@ BEGIN
 ###   @1='2018:01:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4510,7 +4510,7 @@ BEGIN
 ###   @1='2018:01:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4519,7 +4519,7 @@ BEGIN
 ###   @1='2018:01:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4528,7 +4528,7 @@ BEGIN
 ###   @1='2028:02:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4537,7 +4537,7 @@ BEGIN
 ###   @1='2028:02:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4546,7 +4546,7 @@ BEGIN
 ###   @1='2028:02:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4555,7 +4555,7 @@ BEGIN
 ###   @1='2028:02:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4564,7 +4564,7 @@ BEGIN
 ###   @1='2028:02:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4573,7 +4573,7 @@ BEGIN
 ###   @1='2028:02:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4582,7 +4582,7 @@ BEGIN
 ###   @1='2038:03:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4591,7 +4591,7 @@ BEGIN
 ###   @1='2038:03:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4600,7 +4600,7 @@ BEGIN
 ###   @1='2038:03:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4609,7 +4609,7 @@ BEGIN
 ###   @1='2038:03:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4618,7 +4618,7 @@ BEGIN
 ###   @1='2038:03:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4647,92 +4647,92 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4804,7 +4804,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -4829,17 +4829,17 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @3='Wow' /* VARSTRING(60) meta=60 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2=4 /* INT meta=0 nullable=1 is_null=0 */
 ###   @3='Wow' /* VARSTRING(60) meta=60 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=5 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2=6 /* INT meta=0 nullable=1 is_null=0 */
--- a/mysql-test/r/mysqlbinlog_row_myisam.result
+++ b/mysql-test/r/mysqlbinlog_row_myisam.result
@ -2253,7 +2253,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -2363,7 +2363,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=b'0' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'0000000000000000000000000000000000000000000000000000000000000000' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -2458,7 +2458,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -2555,7 +2555,7 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
 ###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
@ -2636,7 +2636,7 @@ BEGIN
 ###   @77=NULL /* TIMESTAMP meta=63233 nullable=1 is_null=1 */
 ###   @78=NULL /* TIMESTAMP meta=63489 nullable=1 is_null=1 */
 ###   @79=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -2731,7 +2731,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=b'0' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'0000000000000000000000000000000000000000000000000000000000000000' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -2906,7 +2906,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3081,7 +3081,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
 ###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
@ -3256,7 +3256,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3431,7 +3431,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3526,7 +3526,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=b'0' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'0000000000000000000000000000000000000000000000000000000000000000' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3621,7 +3621,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=b'1' /* BIT(1) meta=1 nullable=1 is_null=0 */
 ###   @2=b'1111111111111111111111111111111111111111111111111111111111111111' /* BIT(64) meta=2048 nullable=1 is_null=0 */
@ -3716,7 +3716,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=NULL /* type=16 meta=1 nullable=1 is_null=1 */
 ###   @2=NULL /* type=16 meta=2048 nullable=1 is_null=1 */
@ -3898,7 +3898,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -3923,47 +3923,47 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=1 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-04' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-05' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-06' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-07' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:08' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-08' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=8 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:08:09' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-09' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -3982,7 +3982,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -3991,7 +3991,7 @@ BEGIN
 ###   @1='2008:08:11' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=1 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4000,7 +4000,7 @@ BEGIN
 ###   @1='2008:08:12' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4009,7 +4009,7 @@ BEGIN
 ###   @1='2008:08:13' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-04' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4018,7 +4018,7 @@ BEGIN
 ###   @1='2008:08:14' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-04' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-05' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4027,7 +4027,7 @@ BEGIN
 ###   @1='2008:08:15' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-05' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-06' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4036,7 +4036,7 @@ BEGIN
 ###   @1='2008:08:16' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-06' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:08:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-07' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4059,37 +4059,37 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:11' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=1 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:12' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:13' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:14' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-04' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:15' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-05' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:16' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-06' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2008:08:17' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-07' /* VARSTRING(24) meta=24 nullable=1 is_null=0 */
@ -4271,7 +4271,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -4314,47 +4314,47 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-01' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=11 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:08' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-08' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=18 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1='2008:01:09' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4373,47 +4373,47 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-01' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=21 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:08' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-08' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=28 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1='2008:02:09' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4432,47 +4432,47 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t3` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:01' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-01' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=31 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:08' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-08' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=38 /* INT meta=0 nullable=1 is_null=0 */
-### INSERT INTO test.t3
+### INSERT INTO `test`.`t3`
 ### SET
 ###   @1='2008:03:09' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-09' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4499,7 +4499,7 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4508,7 +4508,7 @@ BEGIN
 ###   @1='2018:01:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4517,7 +4517,7 @@ BEGIN
 ###   @1='2018:01:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4526,7 +4526,7 @@ BEGIN
 ###   @1='2018:01:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4535,7 +4535,7 @@ BEGIN
 ###   @1='2018:01:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4544,7 +4544,7 @@ BEGIN
 ###   @1='2018:01:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1='2008:01:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4553,7 +4553,7 @@ BEGIN
 ###   @1='2018:01:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4562,7 +4562,7 @@ BEGIN
 ###   @1='2028:02:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4571,7 +4571,7 @@ BEGIN
 ###   @1='2028:02:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4580,7 +4580,7 @@ BEGIN
 ###   @1='2028:02:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4589,7 +4589,7 @@ BEGIN
 ###   @1='2028:02:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4598,7 +4598,7 @@ BEGIN
 ###   @1='2028:02:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1='2008:02:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4607,7 +4607,7 @@ BEGIN
 ###   @1='2028:02:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4616,7 +4616,7 @@ BEGIN
 ###   @1='2038:03:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4625,7 +4625,7 @@ BEGIN
 ###   @1='2038:03:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4634,7 +4634,7 @@ BEGIN
 ###   @1='2038:03:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4643,7 +4643,7 @@ BEGIN
 ###   @1='2038:03:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4652,7 +4652,7 @@ BEGIN
 ###   @1='2038:03:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### UPDATE test.t3
+### UPDATE `test`.`t3`
 ### WHERE
 ###   @1='2008:03:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4683,92 +4683,92 @@ BEGIN
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1='2018:01:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-01-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1='2028:02:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-02-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=7 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:02' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-02' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=2 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:03' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-03' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=3 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:04' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-04' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=4 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:05' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-05' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=5 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:06' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-06' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
 ###   @3=6 /* INT meta=0 nullable=1 is_null=0 */
-### DELETE FROM test.t3
+### DELETE FROM `test`.`t3`
 ### WHERE
 ###   @1='2038:03:07' /* DATE meta=0 nullable=1 is_null=0 */
 ###   @2='VARCHAR-03-07' /* VARSTRING(255) meta=255 nullable=1 is_null=0 */
@ -4842,7 +4842,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -4867,17 +4867,17 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @3='Wow' /* VARSTRING(60) meta=60 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2=4 /* INT meta=0 nullable=1 is_null=0 */
 ###   @3='Wow' /* VARSTRING(60) meta=60 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=5 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2=6 /* INT meta=0 nullable=1 is_null=0 */
--- a/mysql-test/r/mysqlbinlog_row_trans.result
+++ b/mysql-test/r/mysqlbinlog_row_trans.result
@ -132,7 +132,7 @@ DELIMITER /*!*/;
 ROLLBACK/*!*/;
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -164,15 +164,15 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -180,21 +180,21 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=11 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -205,7 +205,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -247,15 +247,15 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -263,21 +263,21 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=11 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -288,7 +288,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -296,15 +296,15 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -312,21 +312,21 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=11 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -337,7 +337,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -371,15 +371,15 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t1
+### INSERT INTO `test`.`t1`
 ### SET
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -387,21 +387,21 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=11 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t1
+### UPDATE `test`.`t1`
 ### WHERE
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -412,7 +412,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t1` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t1
+### DELETE FROM `test`.`t1`
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -420,15 +420,15 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Write_rows: table id # flags: STMT_END_F
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### INSERT INTO test.t2
+### INSERT INTO `test`.`t2`
 ### SET
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -436,21 +436,21 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Update_rows: table id # flags: STMT_END_F
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=1 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=11 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-1' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=2 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
 ### SET
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
-### UPDATE test.t2
+### UPDATE `test`.`t2`
 ### WHERE
 ###   @1=3 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-3' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
@ -461,7 +461,7 @@ BEGIN
 # at #
 #010909  4:46:40 server id 1  end_log_pos # 	Table_map: `test`.`t2` mapped to number #
 #010909  4:46:40 server id 1  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F
-### DELETE FROM test.t2
+### DELETE FROM `test`.`t2`
 ### WHERE
 ###   @1=12 /* INT meta=0 nullable=1 is_null=0 */
 ###   @2='varchar-2' /* VARSTRING(20) meta=20 nullable=1 is_null=0 */
--- a/mysql-test/r/user_var-binlog.result
+++ b/mysql-test/r/user_var-binlog.result
@ -19,7 +19,7 @@ flush logs;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=10000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
--- a/mysql-test/suite/binlog/r/binlog_base64_flag.result
+++ b/mysql-test/suite/binlog/r/binlog_base64_flag.result
@ -35,7 +35,7 @@ DELIMITER /*!*/;
 # at 4
 <#>ROLLBACK/*!*/;
 # at 102
-<#>use test/*!*/;
+<#>use `test`/*!*/;
 SET TIMESTAMP=1196959712/*!*/;
 <#>SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
--- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
+++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
@ -1,152 +1,152 @@
 Verbose statements from : write-partial-row.binlog
 select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
 stmt
-### INSERT INTO mysql.ndb_apply_status
+### INSERT INTO `mysql`.`ndb_apply_status`
 ### SET
 ###   @1=1
 ###   @2=25769803786
 ###   @3=''
 ###   @4=0
 ###   @5=0
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=3
 ###   @2=3
 ###   @3=3
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=1
 ###   @2=1
 ###   @3=1
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=2
 ###   @2=2
 ###   @3=2
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=4
 ###   @2=4
 ###   @3=4
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=4
 ###   @3=40
-### DELETE FROM test.ba
+### DELETE FROM `test`.`ba`
 ### WHERE
 ###   @1=2
 drop table raw_binlog_rows;
 Verbose statements from : write-full-row.binlog
 select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
 stmt
-### INSERT INTO mysql.ndb_apply_status
+### INSERT INTO `mysql`.`ndb_apply_status`
 ### SET
 ###   @1=2
 ###   @2=25769803786
 ###   @3=''
 ###   @4=0
 ###   @5=0
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=3
 ###   @2=3
 ###   @3=3
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=1
 ###   @2=1
 ###   @3=1
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=2
 ###   @2=2
 ###   @3=2
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=4
 ###   @2=4
 ###   @3=4
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=4
 ###   @2=4
 ###   @3=40
-### DELETE FROM test.ba
+### DELETE FROM `test`.`ba`
 ### WHERE
 ###   @1=2
 drop table raw_binlog_rows;
 Verbose statements from : update-partial-row.binlog
 select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
 stmt
-### INSERT INTO mysql.ndb_apply_status
+### INSERT INTO `mysql`.`ndb_apply_status`
 ### SET
 ###   @1=3
 ###   @2=25769803786
 ###   @3=''
 ###   @4=0
 ###   @5=0
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=3
 ###   @2=3
 ###   @3=3
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=1
 ###   @2=1
 ###   @3=1
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=2
 ###   @2=2
 ###   @3=2
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=4
 ###   @2=4
 ###   @3=4
-### UPDATE test.ba
+### UPDATE `test`.`ba`
 ### WHERE
 ###   @1=4
 ###   @3=4
 ### SET
 ###   @1=4
 ###   @3=40
-### DELETE FROM test.ba
+### DELETE FROM `test`.`ba`
 ### WHERE
 ###   @1=2
 drop table raw_binlog_rows;
 Verbose statements from : update-full-row.binlog
 select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
 stmt
-### INSERT INTO mysql.ndb_apply_status
+### INSERT INTO `mysql`.`ndb_apply_status`
 ### SET
 ###   @1=4
 ###   @2=25769803786
 ###   @3=''
 ###   @4=0
 ###   @5=0
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=3
 ###   @2=3
 ###   @3=3
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=1
 ###   @2=1
 ###   @3=1
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=2
 ###   @2=2
 ###   @3=2
-### INSERT INTO test.ba
+### INSERT INTO `test`.`ba`
 ### SET
 ###   @1=4
 ###   @2=4
 ###   @3=4
-### UPDATE test.ba
+### UPDATE `test`.`ba`
 ### WHERE
 ###   @1=4
 ###   @2=4
@ -155,7 +155,7 @@ stmt
 ###   @1=4
 ###   @2=4
 ###   @3=40
-### DELETE FROM test.ba
+### DELETE FROM `test`.`ba`
 ### WHERE
 ###   @1=2
 drop table raw_binlog_rows;
--- a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result
@ -13,7 +13,7 @@ flush logs;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=10000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
--- a/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
+++ b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result
@ -153,7 +153,7 @@ Warning: The option '--position' is deprecated and will be removed in a future r
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -175,7 +175,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -284,7 +284,7 @@ ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@ -316,7 +316,7 @@ Warning: The option '--position' is deprecated and will be removed in a future r
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
--- a/mysql-test/suite/rpl/r/rpl_sp.result
+++ b/mysql-test/suite/rpl/r/rpl_sp.result
@ -627,7 +627,7 @@ drop database if exists mysqltest1
 SET TIMESTAMP=t/*!*/;
 create database mysqltest1
 /*!*/;
-use mysqltest1/*!*/;
+use `mysqltest1`/*!*/;
 SET TIMESTAMP=t/*!*/;
 create table t1 (a varchar(100))
 /*!*/;
@ -840,7 +840,7 @@ drop database mysqltest1
 SET TIMESTAMP=t/*!*/;
 drop user "zedjzlcsjhd"@127.0.0.1
 /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=t/*!*/;
 drop function if exists f1
 /*!*/;
@ -925,7 +925,7 @@ create database mysqltest
 SET TIMESTAMP=t/*!*/;
 create database mysqltest2
 /*!*/;
-use mysqltest2/*!*/;
+use `mysqltest2`/*!*/;
 SET TIMESTAMP=t/*!*/;
 create table t ( t integer )
 /*!*/;
@ -943,7 +943,7 @@ insert into t values (1);
 return 0;
 end
 /*!*/;
-use mysqltest/*!*/;
+use `mysqltest`/*!*/;
 SET TIMESTAMP=t/*!*/;
 SELECT `mysqltest2`.`f1`()
 /*!*/;
@ -953,14 +953,14 @@ drop database mysqltest
 SET TIMESTAMP=t/*!*/;
 drop database mysqltest2
 /*!*/;
-use test/*!*/;
+use `test`/*!*/;
 SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqltestbug36570_p1`()
 begin
 select 1;
 end
 /*!*/;
-use mysql/*!*/;
+use `mysql`/*!*/;
 SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `test`.` mysqltestbug36570_p2`( a int)
 `label`:
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@ -22,6 +22,7 @@
 #include "rpl_injector.h"
 #include "rpl_filter.h"
 #include "slave.h"
 #include "log_event.h"
 #include "ha_ndbcluster_binlog.h"
 #include "NdbDictionary.hpp"
 #include "ndb_cluster_connection.hpp"
@ -1269,6 +1270,11 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
  }
  char tmp_buf2[FN_REFLEN];
  char quoted_table1[2 + 2 * FN_REFLEN + 1];
  char quoted_db1[2 + 2 * FN_REFLEN + 1];
  char quoted_db2[2 + 2 * FN_REFLEN + 1];
  char quoted_table2[2 + 2 * FN_REFLEN + 1];
  int id_length= 0;
  const char *type_str;
  switch (type)
  {
@ -1278,16 +1284,31 @@ int ndbcluster_log_schema_op(THD *thd, NDB_SHARE *share,
      DBUG_RETURN(0);
    /* redo the drop table query as is may contain several tables */
    query= tmp_buf2;
-    query_length= (uint) (strxmov(tmp_buf2, "drop table `",
+    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_table1,
-                                  table_name, "`", NullS) - tmp_buf2);
+                                            table_name, 0);
    quoted_table1[id_length]= '\0';
    query_length= (uint) (strxmov(tmp_buf2, "drop table ",
                                  quoted_table1, NullS) - tmp_buf2);
    type_str= "drop table";
    break;
  case SOT_RENAME_TABLE:
    /* redo the rename table query as is may contain several tables */
    query= tmp_buf2;
-    query_length= (uint) (strxmov(tmp_buf2, "rename table `",
+    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_db1,
-                                  db, ".", table_name, "` to `",
+                                            db, 0);
-                                  new_db, ".", new_table_name, "`", NullS) - tmp_buf2);
+    quoted_db1[id_length]= '\0';
    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_table1,
                                            table_name, 0);
    quoted_table1[id_length]= '\0';
    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_db2,
                                            new_db, 0);
    quoted_db2[id_length]= '\0';
    id_length= my_strmov_quoted_identifier (thd, (char *) quoted_table2,
                                            new_table_name, 0);
    quoted_table2[id_length]= '\0';
    query_length= (uint) (strxmov(tmp_buf2, "rename table ",
                                  quoted_db1, ".", quoted_table_1, " to ",
                                  quoted_db2, ".", quoted_table2, NullS) - tmp_buf2);
    type_str= "rename table";
    break;
  case SOT_CREATE_TABLE:
--- a/sql/log.cc
+++ b/sql/log.cc
@ -29,6 +29,7 @@
 #include "rpl_filter.h"
 #include "rpl_rli.h"
 #include "sql_show.h"
 #include <my_dir.h>
 #include <stdarg.h>
 #include <m_ctype.h>				// For test_if_number
@ -1708,17 +1709,24 @@ static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv)
  DBUG_ENTER("binlog_savepoint_set");
  binlog_trans_log_savepos(thd, (my_off_t*) sv);
  // buffer to store quoted identifier
  char* buffer= (char *)my_malloc(sizeof("SAVEPOINT ")+ 1 + NAME_LEN * 2 + 2,
                                  MYF(0));
  String log_query(buffer, sizeof(buffer), system_charset_info);
  log_query.length(0);
  /* Write it to the binary log */
-  String log_query;
+  if (log_query.append(STRING_WITH_LEN("SAVEPOINT ")))
  if (log_query.append(STRING_WITH_LEN("SAVEPOINT ")) ||
      log_query.append("`") ||
      log_query.append(thd->lex->ident.str, thd->lex->ident.length) ||
      log_query.append("`"))
    DBUG_RETURN(1);
  else
    append_identifier(thd, &log_query, thd->lex->ident.str,
                      thd->lex->ident.length);
  int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
  Query_log_event qinfo(thd, log_query.c_ptr_safe(), log_query.length(),
                        TRUE, TRUE, errcode);
  my_free(buffer, MYF(MY_WME));
  DBUG_RETURN(mysql_bin_log.write(&qinfo));
 }
@ -1731,18 +1739,23 @@ static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv)
    non-transactional table. Otherwise, truncate the binlog cache starting
    from the SAVEPOINT command.
  */
-  if (unlikely(trans_has_updated_non_trans_table(thd) || 
+  if (unlikely(trans_has_updated_non_trans_table(thd) ||
               (thd->options & OPTION_KEEP_LOG)))
  {
-    String log_query;
+    // buffer to store rollback query with quoted identifier
-    if (log_query.append(STRING_WITH_LEN("ROLLBACK TO ")) ||
+    char* buffer= (char *)my_malloc(12 + 1 + NAME_LEN * 2 + 2, MYF(0));
-        log_query.append("`") ||
+    String log_query(buffer, sizeof(buffer), system_charset_info);
-        log_query.append(thd->lex->ident.str, thd->lex->ident.length) ||
+    log_query.length(0);
-        log_query.append("`"))
+
    if (log_query.append(STRING_WITH_LEN("ROLLBACK TO ")))
      DBUG_RETURN(1);
    else
      append_identifier(thd, &log_query, thd->lex->ident.str,
                        thd->lex->ident.length);
    int errcode= query_error_code(thd, thd->killed == THD::NOT_KILLED);
    Query_log_event qinfo(thd, log_query.c_ptr_safe(), log_query.length(),
                          TRUE, TRUE, errcode);
    my_free(buffer, MYF(MY_WME));
    DBUG_RETURN(mysql_bin_log.write(&qinfo));
  }
  binlog_trans_log_truncate(thd, *(my_off_t*)sv);
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@ -34,6 +34,7 @@
 #include "rpl_utility.h"
 #include "rpl_record.h"
 #include <my_dir.h>
 #include "sql_show.h"    // append_identifier
 #endif /* MYSQL_CLIENT */
@ -1946,6 +1947,10 @@ Rows_log_event::print_verbose_one_row(IO_CACHE *file, table_def *td,
 void Rows_log_event::print_verbose(IO_CACHE *file,
                                   PRINT_EVENT_INFO *print_event_info)
 {
  // Quoted length of the identifier can be twice the original length
  char quoted_db[1 + NAME_LEN * 2 + 2];
  char quoted_table[1 + NAME_LEN * 2 + 2];
  int quoted_db_len, quoted_table_len;
  Table_map_log_event *map;
  table_def *td;
  const char *sql_command, *sql_clause1, *sql_clause2;
@ -1982,9 +1987,23 @@ void Rows_log_event::print_verbose(IO_CACHE *file,
  for (const uchar *value= m_rows_buf; value < m_rows_end; )
  {
    size_t length;
 #ifdef MYSQL_SERVER
    quoted_db_len= my_strmov_quoted_identifier(this->thd, (char *) quoted_db,
                                        map->get_db_name(), 0);
    quoted_table_len= my_strmov_quoted_identifier(this->thd,
                                                  (char *) quoted_table,
                                                  map->get_table_name(), 0);
 #else
    quoted_db_len= my_strmov_quoted_identifier((char *) quoted_db,
                                               map->get_db_name());
    quoted_table_len= my_strmov_quoted_identifier((char *) quoted_table,
                                          map->get_table_name());
 #endif
    quoted_db[quoted_db_len]= '\0';
    quoted_table[quoted_table_len]= '\0';
    my_b_printf(file, "### %s %s.%s\n",
                      sql_command,
-                      map->get_db_name(), map->get_table_name());
+                      quoted_db, quoted_table);
    /* Print the first image */
    if (!(length= print_verbose_one_row(file, td, print_event_info,
                                  &m_cols, value,
@ -2143,24 +2162,20 @@ Log_event::continue_group(Relay_log_info *rli)
 void Query_log_event::pack_info(Protocol *protocol)
 {
  // TODO: show the catalog ??
-  char *buf, *pos;
+  String temp_buf;
-  if (!(buf= (char*) my_malloc(9 + db_len + q_len, MYF(MY_WME))))
+  // Add use `DB` to the string if required
    return;
  pos= buf;
  if (!(flags & LOG_EVENT_SUPPRESS_USE_F)
      && db && db_len)
  {
-    pos= strmov(buf, "use `");
+    temp_buf.append("use ");
-    memcpy(pos, db, db_len);
+    append_identifier(this->thd, &temp_buf, db, db_len);
-    pos= strmov(pos+db_len, "`; ");
+    temp_buf.append("; ");
  }
  // Add the query to the string
  if (query && q_len)
-  {
+    temp_buf.append(query);
-    memcpy(pos, query, q_len);
+ // persist the buffer in protocol
-    pos+= q_len;
+  protocol->store(temp_buf.ptr(), temp_buf.length(), &my_charset_bin);
  }
  protocol->store(buf, pos-buf, &my_charset_bin);
  my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
 }
 #endif
@ -2932,6 +2947,8 @@ void Query_log_event::print_query_header(IO_CACHE* file,
 {
  // TODO: print the catalog ??
  char buff[40],*end;				// Enough for SET TIMESTAMP
  char quoted_id[1+ 2*FN_REFLEN+ 2];
  int quoted_len= 0;
  bool different_db= 1;
  uint32 tmp;
@ -2950,11 +2967,17 @@ void Query_log_event::print_query_header(IO_CACHE* file,
  }
  else if (db)
  {
 #ifdef MYSQL_SERVER
    quoted_len= my_strmov_quoted_identifier(this->thd, (char*)quoted_id, db, 0);
 #else
    quoted_len= my_strmov_quoted_identifier((char*)quoted_id, db);
 #endif
    quoted_id[quoted_len]= '\0';
    different_db= memcmp(print_event_info->db, db, db_len + 1);
    if (different_db)
      memcpy(print_event_info->db, db, db_len + 1);
    if (db[0] && different_db) 
-      my_b_printf(file, "use %s%s\n", db, print_event_info->delimiter);
+      my_b_printf(file, "use %s%s\n", quoted_id, print_event_info->delimiter);
  }
  end=int10_to_str((long) when, strmov(buff,"SET TIMESTAMP="),10);
@ -4216,7 +4239,8 @@ void Format_description_log_event::calc_server_version_split()
 uint Load_log_event::get_query_buffer_length()
 {
  return
-    5 + db_len + 3 +                        // "use DB; "
+    //the DB name may double if we escape the quote character
    5 + 2*db_len + 3 +
    18 + fname_len + 2 +                    // "LOAD DATA INFILE 'file''"
    11 +                                    // "CONCURRENT "
    7 +					    // LOCAL
@ -4235,13 +4259,21 @@ uint Load_log_event::get_query_buffer_length()
 void Load_log_event::print_query(bool need_db, const char *cs, char *buf,
                                 char **end, char **fn_start, char **fn_end)
 {
  char quoted_id[1 + NAME_LEN * 2 + 2];//quoted  length 
  int  quoted_id_len= 0;
  char *pos= buf;
  if (need_db && db && db_len)
  {
-    pos= strmov(pos, "use `");
+    pos= strmov(pos, "use ");
-    memcpy(pos, db, db_len);
+#ifdef MYSQL_SERVER
-    pos= strmov(pos+db_len, "`; ");
+    quoted_id_len= my_strmov_quoted_identifier(this->thd, (char *) quoted_id,
                                               db, 0);
 #else
    quoted_id_len= my_strmov_quoted_identifier((char *) quoted_id, db);
 #endif
    pos+= quoted_id_len;
    pos= strmov(pos, "; ");
  }
  pos= strmov(pos, "LOAD DATA ");
@ -4268,17 +4300,15 @@ void Load_log_event::print_query(bool need_db, const char *cs, char *buf,
  if (fn_end)
    *fn_end= pos;
-  pos= strmov(pos ," TABLE `");
+  pos= strmov(pos ," TABLE ");
  memcpy(pos, table_name, table_name_len);
  pos+= table_name_len;
  if (cs != NULL)
  {
-    pos= strmov(pos ,"` CHARACTER SET ");
+    pos= strmov(pos ," CHARACTER SET ");
    pos= strmov(pos ,  cs);
  }
  else
    pos= strmov(pos, "`");
  /* We have to create all optional fields as the default is not empty */
  pos= strmov(pos, " FIELDS TERMINATED BY ");
@ -4318,9 +4348,9 @@ void Load_log_event::print_query(bool need_db, const char *cs, char *buf,
        *pos++= ' ';
        *pos++= ',';
      }
-      memcpy(pos, field, field_lens[i]);
+      quoted_id_len= my_strmov_quoted_identifier(this->thd, quoted_id, field,
-      pos+=   field_lens[i];
+                                                 0);
-      field+= field_lens[i]  + 1;
+      memcpy(pos, quoted_id, quoted_id_len);
    }
    *pos++= ')';
  }
@ -4560,6 +4590,8 @@ void Load_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
 void Load_log_event::print(FILE* file_arg, PRINT_EVENT_INFO* print_event_info,
 			   bool commented)
 {
  size_t id_len= 0;
  char temp_buf[1 + 2*FN_REFLEN + 2];
  Write_on_release_cache cache(&print_event_info->head_cache, file_arg);
  DBUG_ENTER("Load_log_event::print");
@ -4585,10 +4617,16 @@ void Load_log_event::print(FILE* file_arg, PRINT_EVENT_INFO* print_event_info,
  }
  if (db && db[0] && different_db)
-    my_b_printf(&cache, "%suse %s%s\n", 
+  {
-            commented ? "# " : "",
+#ifdef MYSQL_SERVER
-            db, print_event_info->delimiter);
+    id_len= my_strmov_quoted_identifier(this->thd, temp_buf, db, 0);
-
+#else
    id_len= my_strmov_quoted_identifier(temp_buf, db);
 #endif
    temp_buf[id_len]= '\0';
    my_b_printf(&cache, "%suse %s%s\n",
            commented ? "# " : "", temp_buf, print_event_info->delimiter);
  }
  if (flags & LOG_EVENT_THREAD_SPECIFIC_F)
    my_b_printf(&cache,"%sSET @@session.pseudo_thread_id=%lu%s\n",
            commented ? "# " : "", (ulong)thread_id,
@ -4603,8 +4641,14 @@ void Load_log_event::print(FILE* file_arg, PRINT_EVENT_INFO* print_event_info,
    my_b_printf(&cache,"REPLACE ");
  else if (sql_ex.opt_flags & IGNORE_FLAG)
    my_b_printf(&cache,"IGNORE ");
-  
+
-  my_b_printf(&cache, "INTO TABLE `%s`", table_name);
+#ifdef MYSQL_SERVER
    id_len= my_strmov_quoted_identifier(this->thd, temp_buf, table_name, 0);
 #else
    id_len= my_strmov_quoted_identifier(temp_buf, table_name);
 #endif
  temp_buf[id_len]= '\0';
  my_b_printf(&cache, "INTO TABLE %s", temp_buf);
  my_b_printf(&cache, " FIELDS TERMINATED BY ");
  pretty_print_str(&cache, sql_ex.field_term, sql_ex.field_term_len);
@ -4637,7 +4681,9 @@ void Load_log_event::print(FILE* file_arg, PRINT_EVENT_INFO* print_event_info,
    {
      if (i)
 	my_b_printf(&cache, ",");
-      my_b_printf(&cache, "%s", field);
+      id_len= my_strmov_quoted_identifier((char *) temp_buf, field);
      temp_buf[id_len]= '\0';
      my_b_printf(&cache, "%s", temp_buf);
      field += field_lens[i]  + 1;
    }
@ -5560,7 +5606,10 @@ Xid_log_event::do_shall_skip(Relay_log_info *rli)
 void User_var_log_event::pack_info(Protocol* protocol)
 {
  char *buf= 0;
-  uint val_offset= 4 + name_len;
+  char quoted_id[1 + FN_REFLEN * 2 + 2];// quoted identifier
  int id_len= my_strmov_quoted_identifier(this->thd, quoted_id, name, 0);
  quoted_id[id_len]= '\0';
  uint val_offset= 2 + id_len;
  uint event_len= val_offset;
  if (is_null)
@ -5626,10 +5675,8 @@ void User_var_log_event::pack_info(Protocol* protocol)
    }
  }
  buf[0]= '@';
-  buf[1]= '`';
+  memcpy(buf + 1, quoted_id, id_len);
-  memcpy(buf+2, name, name_len);
+  buf[1 + id_len]= '=';
  buf[2+name_len]= '`';
  buf[3+name_len]= '=';
  protocol->store(buf, event_len, &my_charset_bin);
  my_free(buf, MYF(0));
 }
@ -5740,6 +5787,8 @@ bool User_var_log_event::write(IO_CACHE* file)
 #ifdef MYSQL_CLIENT
 void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
 {
  char quoted_id[1 + NAME_LEN * 2 + 2];// quoted length of the identifier
  int quoted_len= 0;
  Write_on_release_cache cache(&print_event_info->head_cache, file,
                               Write_on_release_cache::FLUSH_F);
@ -5749,9 +5798,11 @@ void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
    my_b_printf(&cache, "\tUser_var\n");
  }
-  my_b_printf(&cache, "SET @`");
+  my_b_printf(&cache, "SET @");
-  my_b_write(&cache, (uchar*) name, (uint) (name_len));
+  quoted_len= my_strmov_quoted_identifier((char *) quoted_id,
-  my_b_printf(&cache, "`");
+                                          (const char *) name);
  quoted_id[quoted_len]= '\0';
  my_b_write(&cache, (uchar*) quoted_id, (uint) quoted_len);
  if (is_null)
  {
@ -7043,14 +7094,23 @@ void Execute_load_query_log_event::print(FILE* file,
 void Execute_load_query_log_event::pack_info(Protocol *protocol)
 {
  char *buf, *pos;
-  if (!(buf= (char*) my_malloc(9 + db_len + q_len + 10 + 21, MYF(MY_WME))))
+  if (!(buf= (char*) my_malloc(9 + (db_len * 2) + 2 + q_len + 10 + 21,
                               MYF(MY_WME))))
    return;
  pos= buf;
  if (db && db_len)
  {
-    pos= strmov(buf, "use `");
+    /*
-    memcpy(pos, db, db_len);
+      Statically allocates room to store '\0' and an identifier
-    pos= strmov(pos+db_len, "`; ");
+      that may have NAME_LEN * 2 due to quoting and there are
      two quoting characters that wrap them.
    */
    char quoted_db[1 + NAME_LEN * 2 + 2];// quoted length of the identifier
    size_t size= 0;
    size= my_strmov_quoted_identifier(this->thd, quoted_db, db, 0);
    pos= strmov(buf, "use ");
    memcpy(pos, quoted_db, size);
    pos= strmov(pos + size, "; ");
  }
  if (query && q_len)
  {
@ -9907,3 +9967,62 @@ st_print_event_info::st_print_event_info()
  open_cached_file(&body_cache, NULL, NULL, 0, flags);
 }
 #endif
 #ifdef MYSQL_SERVER
 /*
  This is a utility function that adds a quoted identifier into the a buffer.
  This also escapes any existance of the quote string inside the identifier.
  SYNOPSIS
    my_strmov_quoted_identifier
    thd                   thread handler
    buffer                target buffer
    identifier            the identifier to be quoted
    length                length of the identifier
 */
 size_t my_strmov_quoted_identifier(THD* thd, char *buffer,
                                   const char* identifier,
                                   uint length)
 {
  int q= thd ? get_quote_char_for_identifier(thd, identifier, length) : '`';
  return my_strmov_quoted_identifier_helper(q, buffer, identifier, length);
 }
 #else
 size_t my_strmov_quoted_identifier(char *buffer,  const char* identifier)
 {
  int q= '`';
  return my_strmov_quoted_identifier_helper(q, buffer, identifier, 0);
 }
 #endif
 size_t my_strmov_quoted_identifier_helper(int q, char *buffer,
                                          const char* identifier,
                                          uint length)
 {
  size_t written= 0;
  char quote_char;
  uint id_length= (length) ? length : strlen(identifier);
  if (q == EOF)
  {
    (void *) strncpy(buffer, identifier, id_length);
    return id_length;
  }
  quote_char= (char) q;
  *buffer++= quote_char;
  written++;
  while (id_length--)
  {
    if (*identifier == quote_char)
    {
      *buffer++= quote_char;
      written++;
    }
    *buffer++= *identifier++;
    written++;
  }
  *buffer++= quote_char;
  return ++written;
 }
--- a/sql/log_event.h
+++ b/sql/log_event.h
@ -3987,6 +3987,22 @@ static inline bool copy_event_cache_to_file_and_reinit(IO_CACHE *cache,
 bool slave_execute_deferred_events(THD *thd);
 #endif
 #ifdef MYSQL_SERVER
 /**
  This is an utility function that adds a quoted identifier into the a buffer.
  This also escapes any existance of the quote string inside the identifier.
 */
 size_t my_strmov_quoted_identifier(THD *thd, char *buffer,
                                   const char* identifier,
                                   uint length);
 #else
 size_t my_strmov_quoted_identifier(char *buffer, const char* identifier);
 #endif
 size_t my_strmov_quoted_identifier_helper(int q, char *buffer,
                                          const char* identifier,
                                          uint length);
 /**
  @} (end of group Replication)
 */
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@ -4144,24 +4144,19 @@ retry:
    entry->file->implicit_emptied= 0;
    if (mysql_bin_log.is_open())
    {
-      char *query, *end;
+      bool error= false;
-      uint query_buf_size= 20 + share->db.length + share->table_name.length +1;
+      String temp_buf;
-      if ((query= (char*) my_malloc(query_buf_size,MYF(MY_WME))))
+      error= temp_buf.append("DELETE FROM ");
-      {
+      append_identifier(thd, &temp_buf, share->db.str, strlen(share->db.str));
-        /* this DELETE FROM is needed even with row-based binlogging */
+      error= temp_buf.append(".");
-        end = strxmov(strmov(query, "DELETE FROM `"),
+      append_identifier(thd, &temp_buf, share->table_name.str,
-                      share->db.str,"`.`",share->table_name.str,"`", NullS);
+                        strlen(share->table_name.str));
-        int errcode= query_error_code(thd, TRUE);
+      int errcode= query_error_code(thd, TRUE);
-        if (thd->binlog_query(THD::STMT_QUERY_TYPE,
+      if (thd->binlog_query(THD::STMT_QUERY_TYPE,
-                              query, (ulong)(end-query),
+                            temp_buf.ptr(), temp_buf.length(),
-                              FALSE, FALSE, errcode))
+                            FALSE, FALSE, errcode))
-        {
+        goto err;
-          my_free(query, MYF(0));
+      if(error)
          goto err;
        }
        my_free(query, MYF(0));
      }
      else
      {
        /*
          As replication is maybe going to be corrupted, we need to warn the
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@ -25,6 +25,7 @@
 #include <my_dir.h>
 #include <m_ctype.h>
 #include "log.h"
 #include "log_event.h"
 #ifdef __WIN__
 #include <direct.h>
 #endif
@ -718,12 +719,17 @@ not_silent:
  {
    char *query;
    uint query_length;
    char db_name_quoted[2 * FN_REFLEN + sizeof("create database ") + 2];
    int id_len= 0;
    if (!thd->query())                          // Only in replication
    {
-      query= 	     tmp_query;
+      id_len= my_strmov_quoted_identifier(thd, (char *) db_name_quoted, db,
-      query_length= (uint) (strxmov(tmp_query,"create database `",
+                                          0);
-                                    db, "`", NullS) - tmp_query);
+      db_name_quoted[id_len]= '\0';
      query= tmp_query;
      query_length= (uint) (strxmov(tmp_query,"create database ",
                                    db_name_quoted, NullS) - tmp_query);
    }
    else
    {
@ -889,7 +895,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
 {
  long deleted=0;
  int error= 0;
-  char	path[FN_REFLEN+16];
+  char	path[2 * FN_REFLEN + 16];
  MY_DIR *dirp;
  uint length;
  TABLE_LIST* dropped_tables= 0;
@ -989,11 +995,17 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
  {
    const char *query;
    ulong query_length;
    // quoted db name + wraping quote
    char buffer_temp [2 * FN_REFLEN + 2];
    int id_len= 0;
    if (!thd->query())
    {
      /* The client used the old obsolete mysql_drop_db() call */
      query= path;
-      query_length= (uint) (strxmov(path, "drop database `", db, "`",
+      id_len= my_strmov_quoted_identifier(thd, buffer_temp, db, strlen(db));
      buffer_temp[id_len] ='\0';
      query_length= (uint) (strxmov(path, "DROP DATABASE ", buffer_temp, "",
                                     NullS) - path);
    }
    else
@ -1029,12 +1041,13 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
  else if (mysql_bin_log.is_open())
  {
    char *query, *query_pos, *query_end, *query_data_start;
    char temp_identifier[ 2 * FN_REFLEN + 2];
    TABLE_LIST *tbl;
-    uint db_len;
+    uint db_len, id_length=0;
    if (!(query= (char*) thd->alloc(MAX_DROP_TABLE_Q_LEN)))
      goto exit; /* not much else we can do */
-    query_pos= query_data_start= strmov(query,"drop table ");
+    query_pos= query_data_start= strmov(query,"DROP TABLE ");
    query_end= query + MAX_DROP_TABLE_Q_LEN;
    db_len= strlen(db);
@ -1054,10 +1067,10 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
        }
        query_pos= query_data_start;
      }
-
+      id_length= my_strmov_quoted_identifier(thd, (char *)temp_identifier,
-      *query_pos++ = '`';
+                                      tbl->table_name, 0);
-      query_pos= strmov(query_pos,tbl->table_name);
+      temp_identifier[id_length]= '\0';
-      *query_pos++ = '`';
+      query_pos= strmov(query_pos,(char *)&temp_identifier);
      *query_pos++ = ',';
    }
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@ -3426,16 +3426,16 @@ int select_create::write_to_binlog(bool is_trans, int errcode)
    if (thd->lex->create_select_in_comment)
      query.append(STRING_WITH_LEN("/*! "));
    if (thd->lex->ignore)
-      query.append(STRING_WITH_LEN("INSERT IGNORE INTO `"));
+      query.append(STRING_WITH_LEN("INSERT IGNORE INTO "));
    else if (thd->lex->duplicates == DUP_REPLACE)
-      query.append(STRING_WITH_LEN("REPLACE INTO `"));
+      query.append(STRING_WITH_LEN("REPLACE INTO "));
    else
-      query.append(STRING_WITH_LEN("INSERT INTO `"));
+      query.append(STRING_WITH_LEN("INSERT INTO "));
-    query.append(create_table->db, db_len);
+    append_identifier(thd, &query, create_table->db, db_len);
-    query.append(STRING_WITH_LEN("`.`"));
+    query.append(STRING_WITH_LEN("."));
-    query.append(create_info->alias, table_len);
+    append_identifier(thd, &query, create_info->alias, table_len );
-    query.append(STRING_WITH_LEN("` "));
+    query.append(STRING_WITH_LEN(" "));
    /*
      The insert items.
@ -3447,9 +3447,8 @@ int select_create::write_to_binlog(bool is_trans, int errcode)
      if (f != field)
        query.append(STRING_WITH_LEN(","));
-      query.append(STRING_WITH_LEN("`"));
+      append_identifier(thd, &query, (*f)->field_name,
-      query.append((*f)->field_name, strlen((*f)->field_name));
+                        strlen((*f)->field_name));
      query.append(STRING_WITH_LEN("`"));
    }
    query.append(STRING_WITH_LEN(") "));
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@ -25,6 +25,7 @@
 #include "sp_head.h"
 #include "sql_trigger.h"
 #include "sql_show.h"
 class READ_INFO {
  File	file;
  uchar	*buffer,			/* Buffer for read text */
@ -619,23 +620,20 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex,
  const char          *tbl= table_name_arg;
  const char          *tdb= (thd->db != NULL ? thd->db : db_arg);
  String              string_buf;
-
+  if (!thd->db || strcmp(db_arg, thd->db))
  if (!thd->db || strcmp(db_arg, thd->db)) 
  {
    /*
-      If used database differs from table's database, 
+      If used database differs from table's database,
-      prefix table name with database name so that it 
+      prefix table name with database name so that it
      becomes a FQ name.
     */
    string_buf.set_charset(system_charset_info);
-    string_buf.append(db_arg);
+    append_identifier(thd, &string_buf, db_arg, strlen(db_arg));
    string_buf.append("`");
    string_buf.append(".");
    string_buf.append("`");
    string_buf.append(table_name_arg);
    tbl= string_buf.c_ptr_safe();
  }
-
+  append_identifier(thd, &string_buf, table_name_arg,
                    strlen(table_name_arg));
  tbl= string_buf.c_ptr_safe();
  Load_log_event       lle(thd, ex, tdb, tbl, fv, duplicates,
                           ignore, transactional_table);
@ -660,11 +658,7 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex,
      if (n++)
        pfields.append(", ");
      if (item->name)
-      {
+        append_identifier(thd, &pfields, item->name, strlen(item->name));
        pfields.append("`");
        pfields.append(item->name);
        pfields.append("`");
      }
      else
        item->print(&pfields, QT_ORDINARY);
    }
@ -684,9 +678,7 @@ static bool write_execute_load_query_log_event(THD *thd, sql_exchange* ex,
      val= lv++;
      if (n++)
        pfields.append(", ");
-      pfields.append("`");
+      append_identifier(thd, &pfields, item->name, strlen(item->name));
      pfields.append(item->name);
      pfields.append("`");
      pfields.append("=");
      val->print(&pfields, QT_ORDINARY);
    }
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@ -1006,7 +1006,8 @@ append_identifier(THD *thd, String *packet, const char *name, uint length)
 {
  const char *name_end;
  char quote_char;
-  int q= get_quote_char_for_identifier(thd, name, length);
+  int q;
  q= thd ? get_quote_char_for_identifier(thd, name, length) : '`';
  if (q == EOF)
  {
--- a/sql/sql_show.h
+++ b/sql/sql_show.h
@ -40,5 +40,6 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
 int view_store_create_info(THD *thd, TABLE_LIST *table, String *buff);
 int copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table);
 int get_quote_char_for_identifier(THD *thd, const char *name, uint length);
 #endif /* SQL_SHOW_H */
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@ -1944,6 +1944,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
  for (table= tables; table; table= table->next_local)
  {
    char *db=table->db;
    int db_len= table->db_length;
    handlerton *table_type;
    enum legacy_db_type frm_db_type= DB_TYPE_UNKNOWN;
@ -1966,14 +1967,14 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
          built_tmp_query.append("DROP TEMPORARY TABLE IF EXISTS ");
        }
        built_tmp_query.append("`");
        if (thd->db == NULL || strcmp(db,thd->db) != 0)
        {
-          built_tmp_query.append(db);
+          append_identifier(thd, &built_tmp_query, db, db_len);
-          built_tmp_query.append("`.`");
+          built_tmp_query.append(".");
        }
-        built_tmp_query.append(table->table_name);
+        append_identifier(thd, &built_tmp_query, table->table_name,
-        built_tmp_query.append("`,");
+                          strlen(table->table_name));
        built_tmp_query.append(",");
      }
      continue;
@ -1999,15 +2000,14 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
        Don't write the database name if it is the current one (or if
        thd->db is NULL).
      */
      built_query.append("`");
      if (thd->db == NULL || strcmp(db,thd->db) != 0)
      {
-        built_query.append(db);
+        append_identifier(thd, &built_query, db, db_len);
-        built_query.append("`.`");
+        built_query.append(".");
      }
-
+      append_identifier(thd, &built_query, table->table_name,
-      built_query.append(table->table_name);
+                        strlen(table->table_name));
-      built_query.append("`,");
+      built_query.append(",");
    }
    if (!drop_temporary)