Skip to content

M
mariadb
Commit 0596b1c6 authored by gluh@mysql.com/eagle.(none)'s avatar gluh@mysql.com/eagle.(none)
Browse files
Options

wrong merge fix

parent 1616c68b
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
sql/sql_parse.cc
View file @ 0596b1c6
...@@ -76,8 +76,6 @@ static void remove_escape(char *name); ...@@ -76,8 +76,6 @@ static void remove_escape(char *name);
static bool append_file_to_dir(THD *thd, const char **filename_ptr, static bool append_file_to_dir(THD *thd, const char **filename_ptr,
const char *table_name); const char *table_name);
static bool check_show_create_table_access(THD *thd, TABLE_LIST *table); static bool check_show_create_table_access(THD *thd, TABLE_LIST *table);
static TABLE_LIST* get_table_by_alias(TABLE_LIST* tl, const char* db,
const char* alias);
static bool test_if_data_home_dir(const char *dir); static bool test_if_data_home_dir(const char *dir);
const char *any_db="*any*"; // Special symbol for check_access const char *any_db="*any*"; // Special symbol for check_access
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7