From 269da4bf192d4fe4291eb3d6013e681af2ddcbef Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Mon, 3 Dec 2018 21:26:07 +0400 Subject: MDEV-5377 Row-based replication of MariaDB temporal data types with FSP>0 into a different column type --- .../rpl/r/rpl_mysql57_stm_temporal_round.result | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result (limited to 'mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result') 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 new file mode 100644 index 00000000000..cd2cbd5aa54 --- /dev/null +++ b/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result @@ -0,0 +1,21 @@ +# +# MDEV-8894 Inserting fractional seconds into MySQL 5.6 master breaks consistency on MariaDB 10 slave +# +include/master-slave.inc +[connection master] +connection slave; +include/stop_slave.inc +connection master; +include/rpl_stop_server.inc [server_number=1] +include/rpl_start_server.inc [server_number=1] +connection slave; +CHANGE MASTER TO master_host='127.0.0.1', master_port=SERVER_MYPORT_1, master_user='root', master_log_file='master-bin.000001', master_log_pos=4; +include/start_slave.inc +connection master; +connection slave; +SELECT * FROM t1 ORDER BY id; +id a +1 2001-01-01 00:00:01.000 +include/stop_slave.inc +DROP TABLE t1; +include/rpl_end.inc -- cgit v1.2.1 From 1c37ac84ef102f4e45d68f1442832a29387c27ba Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 4 Dec 2018 18:11:45 +0400 Subject: MDEV-8894 Inserting fractional seconds into MySQL 5.6 master breaks consistency on MariaDB 10 slave The previous patch 269da4bf192d4fe4291eb3d6013e681af2ddcbef was actually for MDEV-8894 (not for MDEV-5377). It was erroneously pushed with a wrong title. This patch is a small cleanup for MDEV-8894. CREATE TABLE is now not a part of binary logs recorded with MySQL, only INSERT statements are. This will allow to reuse the same binary logs in combinations with different CREATE TABLE statements, to tests different data types. --- mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result | 1 + 1 file changed, 1 insertion(+) (limited to 'mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result') 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] -- cgit v1.2.1