summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-16 14:05:45 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-16 14:05:45 +0300
commitf458e198c0bea67c6a3787738108bbfb139639bd (patch)
treee01d8c096a63bacfb5895de6e55d011d666e9d38 /sql/mysql_priv.h
parent8c5e18c9cfde61197a9f653efa08450ae9a6ce0a (diff)
parent19f0d6b2d9930f83688943b8f98a8b7397584df9 (diff)
downloadmariadb-git-f458e198c0bea67c6a3787738108bbfb139639bd.tar.gz
Merge with 5.2
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index fe0643cdae0..9c4b887091a 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1289,6 +1289,11 @@ bool mysql_handle_derived(LEX *lex, bool (*processor)(THD *thd,
TABLE_LIST *table));
bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *t);
bool mysql_derived_filling(THD *thd, LEX *lex, TABLE_LIST *t);
+bool check_table_file_presence(char *old_path, char *path,
+ const char *db,
+ const char *table_name,
+ const char *alias,
+ bool issue_error);
Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
Item ***copy_func, Field **from_field,
Field **def_field,