diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
| commit | 66d9696596edbc20ad36bf3d5bffb5595e8235c3 (patch) | |
| tree | bbef37c9a90b63d25bee59386cac04298a13846f /mysql-test/extra | |
| parent | 66a58f46e937cdc3d7e0529b52ad8b658d9b2cd4 (diff) | |
| parent | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff) | |
| download | mariadb-git-66d9696596edbc20ad36bf3d5bffb5595e8235c3.tar.gz | |
Merge branch '10.0' into 10.1
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 6b3da087f01..2e093aacb0d 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\// /66/39/ /17/39/ /File exists/Directory not empty/ +--replace_regex /\\testing_1\\*/\/testing_1\// /66/39/ /17/39/ /247/39/ /File exists/Directory not empty/ --error 1010 DROP DATABASE testing_1; let $wait_binlog_event= DROP TABLE IF EXIST; |