Commit ec76945d authored by Elena Stepanova's avatar Elena Stepanova

MDEV-13248 binlog.binlog_parallel_replication_marks_row fails in buildbot

The test did not handle correctly possible difference in system
timezone. The fix is to remove non-functional setting of local
time_zone and instead allow timestamp replacement to work with
any date/time
parent 4693f01f
...@@ -7,10 +7,6 @@ ...@@ -7,10 +7,6 @@
RESET MASTER; RESET MASTER;
--source include/wait_for_binlog_checkpoint.inc --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; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
--let $binlog_pos1=query_get_value(SHOW MASTER STATUS, Position, 1) --let $binlog_pos1=query_get_value(SHOW MASTER STATUS, Position, 1)
/* GTID */ INSERT INTO t1 VALUES (1,0); /* GTID */ INSERT INTO t1 VALUES (1,0);
...@@ -42,7 +38,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; ...@@ -42,7 +38,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
/* GTID */ INSERT INTO t1 VALUES (9, 5, 1); /* GTID */ INSERT INTO t1 VALUES (9, 5, 1);
/* GTID */ COMMIT; /* GTID */ COMMIT;
connect (tmp_con,localhost,root,,); connect (tmp_con,localhost,root,,);
eval set timestamp=$stable_stamp;
/* GTID */ INSERT INTO t1 VALUES (10, 6, 0); /* GTID */ INSERT INTO t1 VALUES (10, 6, 0);
/* GTID */ BEGIN; /* GTID */ BEGIN;
/* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; /* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB;
...@@ -72,7 +67,7 @@ my $file= $ENV{'OUTPUT_FILE'}; ...@@ -72,7 +67,7 @@ my $file= $ENV{'OUTPUT_FILE'};
open F, "<", $file open F, "<", $file
or die "Unable to open file '$file': $!\n"; or die "Unable to open file '$file': $!\n";
while (<F>) { while (<F>) {
s/^#\d+ \d+:\d+:\d+ /# /; s/^#\d+ +\d+:\d+:\d+ /# /;
s/GTID \d+-\d+-\d+/GTID #-#-#/; s/GTID \d+-\d+-\d+/GTID #-#-#/;
s/end_log_pos \d+/end_log_pos #/; s/end_log_pos \d+/end_log_pos #/;
s/table id \d+/table id #/; s/table id \d+/table id #/;
......
RESET MASTER; RESET MASTER;
set time_zone="+02:00";
set timestamp=1579613542;
CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
/* GTID */ INSERT INTO t1 VALUES (1,0); /* GTID */ INSERT INTO t1 VALUES (1,0);
/* GTID */ BEGIN; /* GTID */ BEGIN;
...@@ -30,7 +28,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; ...@@ -30,7 +28,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
/* GTID */ ALTER TABLE t4 ADD b INT; /* GTID */ ALTER TABLE t4 ADD b INT;
/* GTID */ INSERT INTO t1 VALUES (9, 5, 1); /* GTID */ INSERT INTO t1 VALUES (9, 5, 1);
/* GTID */ COMMIT; /* GTID */ COMMIT;
set timestamp=1579613542;
/* GTID */ INSERT INTO t1 VALUES (10, 6, 0); /* GTID */ INSERT INTO t1 VALUES (10, 6, 0);
/* GTID */ BEGIN; /* GTID */ BEGIN;
/* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; /* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB;
......
RESET MASTER; RESET MASTER;
set time_zone="+02:00";
set timestamp=1579613542;
CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
/* GTID */ INSERT INTO t1 VALUES (1,0); /* GTID */ INSERT INTO t1 VALUES (1,0);
/* GTID */ BEGIN; /* GTID */ BEGIN;
...@@ -30,7 +28,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB; ...@@ -30,7 +28,6 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;
/* GTID */ ALTER TABLE t4 ADD b INT; /* GTID */ ALTER TABLE t4 ADD b INT;
/* GTID */ INSERT INTO t1 VALUES (9, 5, 1); /* GTID */ INSERT INTO t1 VALUES (9, 5, 1);
/* GTID */ COMMIT; /* GTID */ COMMIT;
set timestamp=1579613542;
/* GTID */ INSERT INTO t1 VALUES (10, 6, 0); /* GTID */ INSERT INTO t1 VALUES (10, 6, 0);
/* GTID */ BEGIN; /* GTID */ BEGIN;
/* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB; /* GTID */ CREATE TEMPORARY TABLE t5 (a INT PRIMARY KEY) ENGINE=InnoDB;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment