database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
parent b0ff5a6a73 9cba6c5aa3
commit a071e0e029
671 changed files with 11116 additions and 14190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/mysqlbinlog-innodb.test
View File

@ -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;