summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-01-08 15:04:14 -0800
committerIgor Babaev <igor@askmonty.org>2013-01-08 15:04:14 -0800
commit7d9df8075e4c9392f4352e6ccd86921994f264bc (patch)
tree916e10b0a8725f6226c3f9c630516d5c918c8bac /sql/sql_base.h
parent01dca17a9c2255845c050c44e152ece256c9112e (diff)
parentac45f3b38a2098a0a29fd53f023866d6c0dce78d (diff)
downloadmariadb-git-7d9df8075e4c9392f4352e6ccd86921994f264bc.tar.gz
Merge 5.5 -> mwl248
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 aa2ba9e5680..33cea7ebee0 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);