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

wrong merge fix

parent 1616c68b
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ static void remove_escape(char *name);
static bool append_file_to_dir(THD *thd, const char **filename_ptr,
			       const char *table_name);
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);

const char *any_db="*any*";	// Special symbol for check_access