summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-01-08 19:34:33 -0800
committerIgor Babaev <igor@askmonty.org>2013-01-08 19:34:33 -0800
commitf853333e09b222f6d6d76d9343b6202b4769ffab (patch)
treeccbd97f5dbba13aa19469b61108bdc6e10c3a255 /sql/sql_base.h
parent88b59efef6ae869bac9d14cefe2982a1061d3c93 (diff)
parent7d9df8075e4c9392f4352e6ccd86921994f264bc (diff)
downloadmariadb-git-f853333e09b222f6d6d76d9343b6202b4769ffab.tar.gz
Merge 5.5-mwl248 -> 10.0-base
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r--sql/sql_base.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h
index c19e9c68132..5bbccc87cdc 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -302,7 +302,8 @@ TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db,
const char *table_name,
bool no_error);
void mark_tmp_table_for_reuse(TABLE *table);
-bool check_if_table_exists(THD *thd, TABLE_LIST *table, bool *exists);
+bool check_if_table_exists(THD *thd, TABLE_LIST *table, bool fast_check,
+ bool *exists);
int update_virtual_fields(THD *thd, TABLE *table,
enum enum_vcol_update_mode vcol_update_mode= VCOL_UPDATE_FOR_READ);
int dynamic_column_error_message(enum_dyncol_func_result rc);