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 /sql/share | |
| 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 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 2d061fc314c..8da5b3a5c12 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6757,7 +6757,7 @@ ER_TABLESPACE_DISCARDED eng "Tablespace has been discarded for table '%-.192s'" ER_INTERNAL_ERROR - eng "Internal error: '%-.192s'" + eng "Internal error: %-.192s" ER_INNODB_IMPORT_ERROR eng "ALTER TABLE '%-.192s' IMPORT TABLESPACE failed with error %lu : '%s'" |