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/sql_parse.cc | |
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/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index f9bfa6d120b..ec4e873f8ec 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4232,6 +4232,17 @@ end_with_restore_list: my_ok(thd); break; } + else if (first_table && lex->type & REFRESH_FOR_EXPORT) + { + /* Check table-level privileges. */ + if (check_table_access(thd, LOCK_TABLES_ACL | SELECT_ACL, all_tables, + FALSE, UINT_MAX, FALSE)) + goto error; + if (flush_tables_for_export(thd, all_tables)) + goto error; + my_ok(thd); + break; + } /* reload_acl_and_cache() will tell us if we are allowed to write to the |