diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-02 10:00:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-02 10:00:36 +0100 |
| commit | d929342b0f8d5a85aac4e76486b0ff2aff7ca54f (patch) | |
| tree | e14f3a61137bf5d0adc190262c26fa62d2c02ec0 /mysql-test/include/mix1.inc | |
| parent | 65121806da41ba0354c53b0b8ea22445c71ea33b (diff) | |
| download | mariadb-git-d929342b0f8d5a85aac4e76486b0ff2aff7ca54f.tar.gz | |
Merge the server part of MySQL WL#5522 - InnoDB transportable tablespaces.
Syntax. Server support. Test cases.
InnoDB bugfixes:
* don't mess around with system sprintf's, always use my_error() for errors.
* don't use InnoDB internal error codes where OS error codes are expected.
* don't say "file not found", when it was.
Diffstat (limited to 'mysql-test/include/mix1.inc')
| -rw-r--r-- | mysql-test/include/mix1.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 0a5b63b4280..c837eb7a7ad 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -633,7 +633,7 @@ drop table t1; drop table bug29807; --disable_query_log call mtr.add_suppression("InnoDB: Error: table .test...bug29807. does not exist in the InnoDB internal"); -call mtr.add_suppression("InnoDB: Cannot open table test\/bug29807 from"); +call mtr.add_suppression("InnoDB: Cannot open table test/bug29807 from"); --enable_query_log |