diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:41:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-09 15:41:57 +0200 |
| commit | f532653c2920490ac15ad70db0f2f1aaaacb92fe (patch) | |
| tree | 1693b4f73aa617e5ed064401aba4cfc7e3aa7910 /sql/sql_base.h | |
| parent | 6a839ff40d1be946b4391eb7a316b0404e1cd82b (diff) | |
| download | mariadb-git-f532653c2920490ac15ad70db0f2f1aaaacb92fe.tar.gz | |
remove ha_create_table_from_engine()
replace enum read_frm_op with a bitmap flags.
remove always-unused 'error' argument of get_table_share
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 1880b4f4321..fc95ecb0119 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -109,8 +109,7 @@ create_table_def_key(char *key, const char *db, const char *table_name) uint create_tmp_table_def_key(THD *thd, char *key, const char *db, const char *table_name); TABLE_SHARE *get_table_share(THD *thd, const char *db, const char *table_name, - char *key, uint key_length, enum read_frm_op op, - enum open_frm_error *error, + char *key, uint key_length, uint flags, 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); @@ -119,23 +118,20 @@ TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name); static inline TABLE_SHARE *get_table_share(THD *thd, const char *db, const char *table_name, char *key, uint key_length, - enum read_frm_op op, - enum open_frm_error *error) + uint flags) { - return get_table_share(thd, db, table_name, key, key_length, op, error, + return get_table_share(thd, db, table_name, key, key_length, flags, my_calc_hash(&table_def_cache, (uchar*) key, key_length)); } // convenience helper: call get_table_share() without precomputed cache key static inline TABLE_SHARE *get_table_share(THD *thd, const char *db, - const char *table_name, - enum read_frm_op op, - enum open_frm_error *error) + const char *table_name, uint flags) { char key[MAX_DBKEY_LENGTH]; uint key_length; key_length= create_table_def_key(key, db, table_name); - return get_table_share(thd, db, table_name, key, key_length, op, error); + return get_table_share(thd, db, table_name, key, key_length, flags); } TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update, |