Merge 5.5 into 10.0bb-10.0-merge

12 files changed, 307 insertions, 267 deletions

diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result
index 7581a9a7cad..c117c071ecd 100644
--- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result
+++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result
@@ -1,7 +1,7 @@
 drop table if exists t1;
-reset master;
-set @a=UNIX_TIMESTAMP("2020-01-21 15:32:22");
+set @a=UNIX_TIMESTAMP("1970-01-21 15:32:22");
 set timestamp=@a;
+reset master;
 create table t1 (a int auto_increment not null primary key, b char(3));
 insert into t1 values(null, "a");
 insert into t1 values(null, "b");
@@ -21,7 +21,7 @@ insert into t1 values(null, "f");
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -35,46 +35,46 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -93,7 +93,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -104,43 +104,43 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -159,7 +159,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -170,25 +170,25 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -204,7 +204,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -218,19 +218,19 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -249,7 +249,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -276,7 +276,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -287,25 +287,25 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -321,7 +321,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -335,19 +335,19 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -364,7 +364,7 @@ flush logs;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -378,46 +378,46 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -426,7 +426,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -437,7 +437,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -456,7 +456,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -467,43 +467,43 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -512,7 +512,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -523,7 +523,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -542,7 +542,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -553,25 +553,25 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -580,7 +580,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -591,7 +591,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -607,7 +607,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -621,46 +621,46 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -683,7 +683,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -694,25 +694,25 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -721,7 +721,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -732,7 +732,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -748,7 +748,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -762,19 +762,19 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -790,7 +790,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -804,46 +804,46 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -862,7 +862,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -873,43 +873,43 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -927,7 +927,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -938,25 +938,25 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -972,7 +972,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -986,19 +986,19 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1016,7 +1016,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1043,7 +1043,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1054,25 +1054,25 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1088,7 +1088,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1102,19 +1102,19 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1130,7 +1130,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1144,46 +1144,46 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1192,7 +1192,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1203,7 +1203,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1222,7 +1222,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1233,43 +1233,43 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1278,7 +1278,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1289,7 +1289,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1307,7 +1307,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1318,25 +1318,25 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1345,7 +1345,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1356,7 +1356,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1372,7 +1372,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1386,46 +1386,46 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1446,7 +1446,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1457,25 +1457,25 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1484,7 +1484,7 @@ BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1495,7 +1495,7 @@ SET @@session.lc_time_names=0/*!*/;
 SET @@session.collation_database=DEFAULT/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1511,7 +1511,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1525,19 +1525,19 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
@@ -1553,7 +1553,7 @@ ROLLBACK /* added by mysqlbinlog */;
 DELIMITER /*!*/;
 ROLLBACK/*!*/;
 use `test`/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
 SET @@session.sql_mode=0/*!*/;
@@ -1567,55 +1567,55 @@ create table t1 (a int auto_increment not null primary key, b char(3))
 BEGIN
 /*!*/;
 SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "a")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 insert into t1 values(null, "b")
 /*!*/;
-SET TIMESTAMP=1579609942/*!*/;
+SET TIMESTAMP=1773142/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 insert into t1 values(null, "c")
 /*!*/;
-SET TIMESTAMP=1579609944/*!*/;
+SET TIMESTAMP=1773144/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "d")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 insert into t1 values(null, "e")
 /*!*/;
-SET TIMESTAMP=1579609946/*!*/;
+SET TIMESTAMP=1773146/*!*/;
 COMMIT
 /*!*/;
 BEGIN
 /*!*/;
 SET INSERT_ID=6/*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 insert into t1 values(null, "f")
 /*!*/;
-SET TIMESTAMP=1579609943/*!*/;
+SET TIMESTAMP=1773143/*!*/;
 COMMIT
 /*!*/;
 DELIMITER ;
diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
index 367314d9643..b26dcc3f4af 100644
--- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
+++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
@@ -8,15 +8,15 @@
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
-reset master;
 
 # We need this for getting fixed timestamps inside of this test.
-# I use a date in the future to keep a growing timestamp along the
+# I use a date in the past to keep a growing timestamp along the
 # binlog (including the Start_log_event). This test will work 
 # unchanged everywhere, because mysql-test-run has fixed TZ, which it
 # exports (so mysqlbinlog has same fixed TZ).
-set @a=UNIX_TIMESTAMP("2020-01-21 15:32:22");
+set @a=UNIX_TIMESTAMP("1970-01-21 15:32:22");
 set timestamp=@a;
+reset master;
 create table t1 (a int auto_increment not null primary key, b char(3));
 insert into t1 values(null, "a");
 insert into t1 values(null, "b");
@@ -70,11 +70,11 @@ let $stop_pos= `select @binlog_start_pos + 857`;
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001
 --disable_query_log
 select "--- stop-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001
 
 --disable_query_log
 select "--- Local with 2 binlogs on command line --" as "";
@@ -102,11 +102,11 @@ let $stop_pos= `select @binlog_start_pos + 134`;
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
+--exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
 --disable_query_log
 select "--- stop-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
+--exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000002
 
 --disable_query_log
 select "--- Remote --" as "";
@@ -137,11 +137,11 @@ let $stop_pos= `select @binlog_start_pos + 812`;
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--start-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
+--exec $MYSQL_BINLOG --short-form "--start-datetime=1970-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
 --disable_query_log
 select "--- stop-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
+--exec $MYSQL_BINLOG --short-form "--stop-datetime=1970-01-21 15:32:24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
 
 --disable_query_log
 select "--- Remote with 2 binlogs on command line --" as "";
@@ -166,11 +166,11 @@ let $stop_pos= `select @binlog_start_pos + 109`;
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--start-datetime=20200121153224" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
+--exec $MYSQL_BINLOG --short-form "--start-datetime=19700121153224" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
 --disable_query_log
 select "--- stop-datetime --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form "--stop-datetime=2020/01/21 15@32@24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
+--exec $MYSQL_BINLOG --short-form "--stop-datetime=1970/01/21 15@32@24" --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002
 
 --disable_query_log
 select "--- to-last-log --" as "";
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
index fc768ab197b..5dc0abc56b7 100644
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
@@ -1117,7 +1117,7 @@ checksum table t1, t2, t3, t4 extended;
 drop table t1,t2,t3;
 
 #
-# Test problem with refering to different fields in same table in UNION
+# Test problem with referring to different fields in same table in UNION
 # (Bug #2552)
 #
 create table t1 (id int,  name char(10) not null,  name2 char(10) not null) engine=innodb;
diff --git a/mysql-test/suite/plugins/t/thread_pool_server_audit.test b/mysql-test/suite/plugins/t/thread_pool_server_audit.test
index 724000c9789..7347d8f99ff 100644
--- a/mysql-test/suite/plugins/t/thread_pool_server_audit.test
+++ b/mysql-test/suite/plugins/t/thread_pool_server_audit.test
@@ -42,8 +42,10 @@ select 1,
         3;
 insert into t2 values (1), (2);
 select * from t2;
+--disable_ps_protocol
 --error ER_NO_SUCH_TABLE
 select * from t_doesnt_exist;
+--enable_ps_protocol
 --error 1064
 syntax_error_query;
 drop table renamed_t1, t2;
diff --git a/mysql-test/suite/rpl/r/rpl_rewrt_db.result b/mysql-test/suite/rpl/r/rpl_rewrt_db.result
index d9b6006fbb0..c22ec7af810 100644
--- a/mysql-test/suite/rpl/r/rpl_rewrt_db.result
+++ b/mysql-test/suite/rpl/r/rpl_rewrt_db.result
@@ -1,19 +1,36 @@
 include/master-slave.inc
 [connection master]
+set sql_log_bin=0;
+create database y;
+set sql_log_bin=1;
 drop database if exists mysqltest1;
+drop database if exists x;
 create database mysqltest1;
+set sql_log_bin=0;
+create database x;
+set sql_log_bin=1;
 use mysqltest1;
 create table t1 (a int);
 insert into t1 values(9);
+use x;
+create table t1 (a int);
+insert into t1 values(9);
 select * from mysqltest1.t1;
 a
 9
+select * from x.t1;
+a
+9
 show databases like 'mysqltest1';
 Database (mysqltest1)
 mysqltest1
 select * from test.t1;
 a
 9
+select * from y.t1;
+a
+9
+use mysqltest1;
 drop table t1;
 drop database mysqltest1;
 drop database if exists rewrite;
@@ -215,10 +232,12 @@ SET sql_log_bin= 0;
 DROP DATABASE database_master_temp_01;
 DROP DATABASE database_master_temp_02;
 DROP DATABASE database_master_temp_03;
+DROP DATABASE x;
 SET sql_log_bin= 1;
 SET sql_log_bin= 0;
 DROP DATABASE database_slave_temp_01;
 DROP DATABASE database_slave_temp_02;
 DROP DATABASE database_slave_temp_03;
+DROP DATABASE y;
 SET sql_log_bin= 1;
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt b/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
index 290b92e0a3e..84059110136 100644
--- a/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
+++ b/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
@@ -1 +1 @@
-"--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1->test"  "--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03"
+"--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1 -> test" "--replicate-rewrite-db=x -> y" "--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03"
diff --git a/mysql-test/suite/rpl/t/rpl_rewrt_db.test b/mysql-test/suite/rpl/t/rpl_rewrt_db.test
index 996ad0a10c7..bd0749bc2de 100644
--- a/mysql-test/suite/rpl/t/rpl_rewrt_db.test
+++ b/mysql-test/suite/rpl/t/rpl_rewrt_db.test
@@ -2,20 +2,37 @@
 -- source include/have_binlog_format_mixed_or_statement.inc
 -- source include/master-slave.inc
 
+--connection slave
+set sql_log_bin=0;
+create database y;
+set sql_log_bin=1;
+
+--connection master
 --disable_warnings
 drop database if exists mysqltest1;
+drop database if exists x;
 --enable_warnings
 create database mysqltest1;
+set sql_log_bin=0;
+create database x;
+set sql_log_bin=1;
 
 use mysqltest1;
 create table t1 (a int);
 insert into t1 values(9);
+use x;
+create table t1 (a int);
+insert into t1 values(9);
 select * from mysqltest1.t1;
+select * from x.t1;
 sync_slave_with_master;
+#TODO no it is no empty
 show databases like 'mysqltest1'; # should be empty
 select * from test.t1;
+select * from y.t1;
 # cleanup
 connection master;
+use mysqltest1;
 drop table t1;
 drop database mysqltest1;
 sync_slave_with_master;
@@ -224,6 +241,7 @@ SET sql_log_bin= 0;
 DROP DATABASE database_master_temp_01;
 DROP DATABASE database_master_temp_02;
 DROP DATABASE database_master_temp_03;
+DROP DATABASE x;
 SET sql_log_bin= 1;
 
 connection slave;
@@ -231,6 +249,7 @@ SET sql_log_bin= 0;
 DROP DATABASE database_slave_temp_01;
 DROP DATABASE database_slave_temp_02;
 DROP DATABASE database_slave_temp_03;
+DROP DATABASE y;
 SET sql_log_bin= 1;
 
 connection master;
diff --git a/mysql-test/suite/storage_engine/vcol.result b/mysql-test/suite/storage_engine/vcol.result
index d51ab038576..24b54928dfc 100644
--- a/mysql-test/suite/storage_engine/vcol.result
+++ b/mysql-test/suite/storage_engine/vcol.result
@@ -7,8 +7,8 @@ b	int(11)	#		#	VIRTUAL
 INSERT INTO t1 (a) VALUES (1),(2);
 INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
 SELECT a,b FROM t1;
 a	b
 1	2
@@ -24,8 +24,8 @@ b	int(11)	#		#	PERSISTENT
 INSERT INTO t1 (a) VALUES (1),(2);
 INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
 SELECT a,b FROM t1;
 a	b
 1	2
@@ -41,8 +41,8 @@ b	int(11)	#		#	VIRTUAL
 INSERT INTO t1 (a) VALUES (1),(2);
 INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
 SELECT a,b FROM t1;
 a	b
 1	2
@@ -58,8 +58,8 @@ b	int(11)	#		#	PERSISTENT
 INSERT INTO t1 (a) VALUES (1),(2);
 INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
 SELECT a,b FROM t1;
 a	b
 1	2
diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
index af03cc4d482..cc81fabe2f0 100644
--- a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
+++ b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
@@ -25,8 +25,8 @@ a	b	c
 # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
 insert into t1 values (1,2,3);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'c' in table 't1' ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
+Warning	1906	The value specified for computed column 'c' in table 't1' has been ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -65,8 +65,8 @@ a	b	c
 # against vcols
 insert into t1 (a,b) values (1,3), (2,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -107,8 +107,8 @@ a	b	c
 create table t2 like t1;
 insert into t2 select * from t1;
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
-Warning	1906	The value specified for computed column 'c' in table 't2' ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for computed column 'c' in table 't2' has been ignored
 select * from t1;
 a	b	c
 2	-2	-2
@@ -123,8 +123,8 @@ a	b	c
 create table t2 like t1;
 insert into t2 (a,b) select a,b from t1;
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
 select * from t2;
 a	b	c
 2	-2	-2
@@ -159,7 +159,7 @@ a	b	c
 2	-2	-2
 update t1 set c=3 where a=2;
 Warnings:
-Warning	1906	The value specified for computed column 'c' in table 't1' ignored
+Warning	1906	The value specified for computed column 'c' in table 't1' has been ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -189,7 +189,7 @@ a	b	c
 2	-2	-2
 update t1 set c=3 where b=-2;
 Warnings:
-Warning	1906	The value specified for computed column 'c' in table 't1' ignored
+Warning	1906	The value specified for computed column 'c' in table 't1' has been ignored
 select * from t1;
 a	b	c
 1	-1	-1
diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
index 351dfd2858c..eccf1199790 100644
--- a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
@@ -25,8 +25,8 @@ a	b	c
 # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
 insert into t1 values (1,2,3);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'c' in table 't1' ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
+Warning	1906	The value specified for computed column 'c' in table 't1' has been ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -65,8 +65,8 @@ a	b	c
 # against vcols
 insert into t1 (a,b) values (1,3), (2,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't1' has been ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -107,8 +107,8 @@ a	b	c
 create table t2 like t1;
 insert into t2 select * from t1;
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
-Warning	1906	The value specified for computed column 'c' in table 't2' ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for computed column 'c' in table 't2' has been ignored
 select * from t1;
 a	b	c
 2	-2	-2
@@ -123,8 +123,8 @@ a	b	c
 create table t2 like t1;
 insert into t2 (a,b) select a,b from t1;
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
 select * from t2;
 a	b	c
 2	-2	-2
@@ -159,7 +159,7 @@ a	b	c
 2	-2	-2
 update t1 set c=3 where a=2;
 Warnings:
-Warning	1906	The value specified for computed column 'c' in table 't1' ignored
+Warning	1906	The value specified for computed column 'c' in table 't1' has been ignored
 select * from t1;
 a	b	c
 1	-1	-1
@@ -189,7 +189,7 @@ a	b	c
 2	-2	-2
 update t1 set c=3 where b=-2;
 Warnings:
-Warning	1906	The value specified for computed column 'c' in table 't1' ignored
+Warning	1906	The value specified for computed column 'c' in table 't1' has been ignored
 select * from t1;
 a	b	c
 1	-1	-1
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result
index 92be94cbb81..51db575db8c 100644
--- a/mysql-test/suite/vcol/r/vcol_misc.result
+++ b/mysql-test/suite/vcol/r/vcol_misc.result
@@ -108,10 +108,10 @@ DROP TABLE t1,t2;
 CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL);
 INSERT INTO t1 VALUES (0,1,0);
 Warnings:
-Warning	1906	The value specified for computed column 'v' in table 't1' ignored
+Warning	1906	The value specified for computed column 'v' in table 't1' has been ignored
 INSERT INTO t1 VALUES (NULL,0,0);
 Warnings:
-Warning	1906	The value specified for computed column 'v' in table 't1' ignored
+Warning	1906	The value specified for computed column 'v' in table 't1' has been ignored
 SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1;
 a	p	v	ROUND(a,p)	ROUND(a,p+NULL)
 1	0	1	1	NULL
@@ -306,15 +306,15 @@ d	varchar(5)	latin1_swedish_ci	YES		NULL	PERSISTENT	#
 INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL);
 UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND  `d`='a';
 Warnings:
-Warning	1906	The value specified for computed column 'd' in table 't1' ignored
+Warning	1906	The value specified for computed column 'd' in table 't1' has been ignored
 INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a');
 Warnings:
-Warning	1906	The value specified for computed column 'd' in table 't1' ignored
+Warning	1906	The value specified for computed column 'd' in table 't1' has been ignored
 set sql_mode='strict_all_tables';
 UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND  `d`='a';
-ERROR HY000: The value specified for computed column 'd' in table 't1' ignored
+ERROR HY000: The value specified for computed column 'd' in table 't1' has been ignored
 INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a');
-ERROR HY000: The value specified for computed column 'd' in table 't1' ignored
+ERROR HY000: The value specified for computed column 'd' in table 't1' has been ignored
 drop table t1;
 #
 # MDEV-5611: self-referencing virtual column
diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result
index 6dee132b3e5..9e0259087c5 100644
--- a/mysql-test/suite/vcol/r/vcol_select_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result
@@ -273,9 +273,9 @@ INSERT INTO t1 VALUES (NULL),( 78), (185), (0), (154);
 CREATE TABLE t2 (a int, b int AS (a) VIRTUAL);
 INSERT INTO t2 VALUES (187,187), (9,9), (187,187);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
-Warning	1906	The value specified for computed column 'b' in table 't2' ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
+Warning	1906	The value specified for computed column 'b' in table 't2' has been ignored
 EXPLAIN EXTENDED
 SELECT * FROM t1 JOIN t2 USING (b);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra