summaryrefslogtreecommitdiff
path: root/sql/sql_base.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-09 15:35:15 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-09 15:35:15 +0200
commitb0a5dd73fa7d9f239661cc1683422f14e69c53eb (patch)
tree803e21ef37e2ba4007e74866435694d77e4df06a /sql/sql_base.h
parent87a9d60ec625c8f1e8563de648105b36add9e940 (diff)
downloadmariadb-git-b0a5dd73fa7d9f239661cc1683422f14e69c53eb.tar.gz
* remove ha_check_if_table_exists() and get_table_share_with_discover().
* rename check_if_table_exists() -> table_exists() and remove unneeded arguments
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r--sql/sql_base.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h
index e0612397361..8bcbbff556e 100644
--- a/sql/sql_base.h
+++ b/sql/sql_base.h
@@ -112,7 +112,6 @@ TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, char *key,
enum open_frm_error *error,
my_hash_value_type hash_value);
void release_table_share(TABLE_SHARE *share);
-TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name);
TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update,
uint lock_flags);
@@ -333,8 +332,14 @@ 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 fast_check,
- bool *exists);
+
+bool table_exists(THD *thd, const char *db, const char *table_name,
+ const char *path);
+static inline bool table_exists(THD *thd, TABLE_LIST *table)
+{
+ return table_exists(thd, table->db, table->table_name, NULL);
+}
+
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);