diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/mysqlbinlog-innodb.test | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mysqlbinlog-innodb.test')
| -rw-r--r-- | mysql-test/main/mysqlbinlog-innodb.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/mysqlbinlog-innodb.test b/mysql-test/main/mysqlbinlog-innodb.test index c8bf8095705..559fe785c00 100644 --- a/mysql-test/main/mysqlbinlog-innodb.test +++ b/mysql-test/main/mysqlbinlog-innodb.test @@ -24,7 +24,9 @@ COMMIT; USE test; SELECT * FROM t1 ORDER BY a; FLUSH LOGS; +--replace_regex /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 --short-form +--replace_regex /@@session.sql_mode=\d+/@@session.sql_mode=#/ /collation_server=\d+/collation_server=#/ --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 --short-form --rewrite-db="test->foo" --rewrite-db="test2->bar" DROP DATABASE test2; DROP TABLE t1; |