diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 17:16:40 +0300 |
| commit | 4081b7b27a40df6244e0525885cf70e48b7b35bc (patch) | |
| tree | e9e6199730603d05090e0550e023e92c7a32f88d /mysql-test/main/mysqlbinlog-innodb.test | |
| parent | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (diff) | |
| parent | 244f0e6dd815b388282c15db4fe7f15533f4c8fc (diff) | |
| download | mariadb-git-4081b7b27a40df6244e0525885cf70e48b7b35bc.tar.gz | |
Merge 10.4 into 10.5
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; |