diff options
3 files changed, 1 insertions, 12 deletions
diff --git a/mysql-test/include/binlog_parallel_replication_marks.test b/mysql-test/include/binlog_parallel_replication_marks.test index 1b6fbe26142..ff35875aece 100644 --- a/mysql-test/include/binlog_parallel_replication_marks.test +++ b/mysql-test/include/binlog_parallel_replication_marks.test @@ -7,10 +7,6 @@ RESET MASTER; --source include/wait_for_binlog_checkpoint.inc -set time_zone="+02:00"; ---let $stable_stamp= `SELECT UNIX_TIMESTAMP("2020-01-21 15:32:22")` -eval set timestamp=$stable_stamp; - CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; --let $binlog_pos1=query_get_value(SHOW MASTER STATUS, Position, 1) /* GTID */ INSERT INTO t1 VALUES (1,0); @@ -42,7 +38,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; /* GTID */ INSERT INTO t1 VALUES (9, 5, 1); /* GTID */ COMMIT; connect (tmp_con,localhost,root,,); -eval set timestamp=$stable_stamp; /* GTID */ INSERT INTO t1 VALUES (10, 6, 0); /* GTID */ BEGIN; /* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; @@ -72,7 +67,7 @@ my $file= $ENV{'OUTPUT_FILE'}; open F, "<", $file or die "Unable to open file '$file': $!\n"; while (<F>) { - s/^#\d+ \d+:\d+:\d+ /# /; + s/^#\d+ +\d+:\d+:\d+ /# /; s/GTID \d+-\d+-\d+/GTID #-#-#/; s/end_log_pos \d+/end_log_pos #/; s/table id \d+/table id #/; diff --git a/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result b/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result index b0bba30bd00..e9a744a748e 100644 --- a/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result +++ b/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_row.result @@ -1,6 +1,4 @@ RESET MASTER; -set time_zone="+02:00"; -set timestamp=1579613542; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; /* GTID */ INSERT INTO t1 VALUES (1,0); /* GTID */ BEGIN; @@ -30,7 +28,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; /* GTID */ ALTER TABLE t4 ADD b INT; /* GTID */ INSERT INTO t1 VALUES (9, 5, 1); /* GTID */ COMMIT; -set timestamp=1579613542; /* GTID */ INSERT INTO t1 VALUES (10, 6, 0); /* GTID */ BEGIN; /* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; diff --git a/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result b/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result index c5dffff7446..c2876a3e849 100644 --- a/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result +++ b/mysql-test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result @@ -1,6 +1,4 @@ RESET MASTER; -set time_zone="+02:00"; -set timestamp=1579613542; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; /* GTID */ INSERT INTO t1 VALUES (1,0); /* GTID */ BEGIN; @@ -30,7 +28,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; /* GTID */ ALTER TABLE t4 ADD b INT; /* GTID */ INSERT INTO t1 VALUES (9, 5, 1); /* GTID */ COMMIT; -set timestamp=1579613542; /* GTID */ INSERT INTO t1 VALUES (10, 6, 0); /* GTID */ BEGIN; /* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; |