diff --git a/mysql-test/std_data/rpl/mysql-5.7.11-stm-temporal-round-binlog.000001 b/mysql-test/std_data/rpl/mysql-5.7.11-stm-temporal-round-binlog.000001 index a8de8b8c760..5010e164e43 100644 Binary files a/mysql-test/std_data/rpl/mysql-5.7.11-stm-temporal-round-binlog.000001 and b/mysql-test/std_data/rpl/mysql-5.7.11-stm-temporal-round-binlog.000001 differ diff --git a/mysql-test/std_data/rpl/mysql-8.0.13-stm-temporal-round-binlog.000001 b/mysql-test/std_data/rpl/mysql-8.0.13-stm-temporal-round-binlog.000001 index 79e242d0783..4d582fdf5bb 100644 Binary files a/mysql-test/std_data/rpl/mysql-8.0.13-stm-temporal-round-binlog.000001 and b/mysql-test/std_data/rpl/mysql-8.0.13-stm-temporal-round-binlog.000001 differ diff --git a/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result b/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result index cd2cbd5aa54..bedd103c2a0 100644 --- a/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result +++ b/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result @@ -4,6 +4,7 @@ include/master-slave.inc [connection master] connection slave; +CREATE TABLE t1 (id SERIAL, a DATETIME(3)); include/stop_slave.inc connection master; include/rpl_stop_server.inc [server_number=1] diff --git a/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result b/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result index c1408deb467..23b3217895a 100644 --- a/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result +++ b/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result @@ -4,6 +4,7 @@ include/master-slave.inc [connection master] connection slave; +CREATE TABLE t1 (id SERIAL, a DATETIME(3)); include/stop_slave.inc connection master; include/rpl_stop_server.inc [server_number=1] diff --git a/mysql-test/suite/rpl/t/rpl_mysql57_stm_temporal_round.test b/mysql-test/suite/rpl/t/rpl_mysql57_stm_temporal_round.test index e29d15fbf4f..675b7db0603 100644 --- a/mysql-test/suite/rpl/t/rpl_mysql57_stm_temporal_round.test +++ b/mysql-test/suite/rpl/t/rpl_mysql57_stm_temporal_round.test @@ -1,3 +1,5 @@ +--source include/have_binlog_format_statement.inc + --echo # --echo # MDEV-8894 Inserting fractional seconds into MySQL 5.6 master breaks consistency on MariaDB 10 slave --echo # @@ -6,6 +8,7 @@ --source include/master-slave.inc --connection slave +CREATE TABLE t1 (id SERIAL, a DATETIME(3)); --source include/stop_slave.inc --connection master @@ -19,10 +22,15 @@ # # Simulate MySQL 5.7.x master # -# mysql-5.7.11-stm-temporal-round-binlog.000001 was recorded with -# "mysqld --log-bin --binlog-format=statement", with the following SQL script: -# +# mysql-5.7.11-stm-temporal-round-binlog.000001 was recorded against a +# table with this structure: #CREATE TABLE t1 (id SERIAL, a DATETIME(3)); +# (note, the CREATE statement is not inside the binary log) +# +# using this command line: +# mysqld --log-bin --binlog-format=statement +# with the following single SQL statement: +# #INSERT INTO t1 (a) VALUES ('2001-01-01 00:00:00.999999'); # diff --git a/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test b/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test index a4d0734d225..ad6df9d9993 100644 --- a/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test +++ b/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test @@ -1,3 +1,5 @@ +--source include/have_binlog_format_statement.inc + --echo # --echo # MDEV-8894 Inserting fractional seconds into MySQL 5.6 master breaks consistency on MariaDB 10 slave --echo # @@ -6,6 +8,7 @@ --source include/master-slave.inc --connection slave +CREATE TABLE t1 (id SERIAL, a DATETIME(3)); --source include/stop_slave.inc --connection master @@ -19,12 +22,17 @@ # # Simulate MySQL 8.0.x master # -# mysql-8.0.13-stm-temporal-round-binlog.000001 was recorded with -# "mysqld --log-bin --binlog-format=statement", with the following SQL script: -# -#SET NAMES utf8mb4 COLLATE utf8mb4_general_ci; -#SET sql_mode=''; +# mysql-8.0.13-stm-temporal-round-binlog.000001 was recorded against a +# table with this structure: #CREATE TABLE t1 (id SERIAL, a DATETIME(3)); +# (note, the CREATE statement is not inside the binary log) +# +# using this command line: +# mysqld --log-bin --binlog-format=statement --server-id=1 --character-set-server=latin1 +# with the following SQL script: +# +#SET NAMES latin1 COLLATE latin1_swedish_ci; +#SET sql_mode=''; #INSERT INTO t1 (a) VALUES ('2001-01-01 00:00:00.999999'); #SET sql_mode=TIME_TRUNCATE_FRACTIONAL; #INSERT INTO t1 (a) VALUES ('2001-01-01 00:00:00.999999');