diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-19 20:35:04 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-19 20:35:04 +0200 |
| commit | 45912599cacbfe6800f9fc6643b7963f06cc4184 (patch) | |
| tree | 0c2d574cdc0e960bee5101995392edd924d148bc /sql/sql_parse.h | |
| parent | 53375573e32e77676f4a4338099e44698b1bfb45 (diff) | |
| parent | 016bef6ea0558a0b9758e22f448f89bf3ba25197 (diff) | |
| download | mariadb-git-45912599cacbfe6800f9fc6643b7963f06cc4184.tar.gz | |
10.0 merge
Diffstat (limited to 'sql/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index fd52fb20ea7..346a3c8899b 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -34,6 +34,7 @@ enum enum_mysql_completiontype { }; extern "C" int test_if_data_home_dir(const char *dir); +int error_if_data_home_dir(const char *path, const char *what); bool multi_update_precheck(THD *thd, TABLE_LIST *tables); bool multi_delete_precheck(THD *thd, TABLE_LIST *tables); @@ -195,7 +196,7 @@ check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables, /* These were under the INNODB_COMPATIBILITY_HOOKS */ -bool check_global_access(THD *thd, ulong want_access); +bool check_global_access(THD *thd, ulong want_access, bool no_errors= false); inline bool is_supported_parser_charset(CHARSET_INFO *cs) { |