diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-27 17:36:54 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-27 17:36:54 -0500 |
| commit | af651c80f7d7b49a141958a68e81f2de90e62f25 (patch) | |
| tree | fe6beb28814b0e5a149dde1597463c8fe9faa177 /mysql-test/extra | |
| parent | f02fdb6b55a2b29595cb7e4eed48a51755e967fb (diff) | |
| parent | 5c66abf0b0de6d632f85a57c841f80d28a7e0337 (diff) | |
| download | mariadb-git-af651c80f7d7b49a141958a68e81f2de90e62f25.tar.gz | |
Merge tag 'mariadb-10.0.17' into 10.0-galera
Conflicts:
storage/innobase/include/trx0trx.h
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/binlog_tests/database.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/binlog_tests/database.test b/mysql-test/extra/binlog_tests/database.test index 61e8b594185..cd0266434ff 100644 --- a/mysql-test/extra/binlog_tests/database.test +++ b/mysql-test/extra/binlog_tests/database.test @@ -52,7 +52,7 @@ eval SELECT 'hello' INTO OUTFILE 'fake_file.$prefix'; # Use '/' instead of '\' in the error message. On windows platform, dir is # formed with '\'. ---replace_regex /\\testing_1\\*/\/testing_1\// +--replace_regex /\\testing_1\\*/\/testing_1\// /66/39/ --error 1010 DROP DATABASE testing_1; let $wait_binlog_event= DROP TABLE IF EXIST; |