diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-06 20:28:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-07-06 20:28:08 +0300 |
| commit | d902d43ce77fb41c2def1248fc572e997843ddae (patch) | |
| tree | 4baa39ecc480fcc0f45f6560786752b825a262db /mysql-test/include | |
| parent | 99d52c45cb4a686e618db6c6614e1fa170878116 (diff) | |
| parent | 2b5c9bc2c813ea7963959e515da5d60392c35431 (diff) | |
| download | mariadb-git-d902d43ce77fb41c2def1248fc572e997843ddae.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/binlog_parallel_replication_marks.test | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mysql-test/include/binlog_parallel_replication_marks.test b/mysql-test/include/binlog_parallel_replication_marks.test index a6db745c25b..b915d26ce99 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 #/; |