diff options
| author | anozdrin@mysql.com <> | 2005-12-07 17:17:42 +0300 |
|---|---|---|
| committer | anozdrin@mysql.com <> | 2005-12-07 17:17:42 +0300 |
| commit | 5b981a48448d520cdd7c9f9991e5489b06dd319c (patch) | |
| tree | 763144b950b19c3f90be07331782b4e4629cfc1e /sql/mysql_priv.h | |
| parent | e9e782900ffbd8485c6e83f2afe01a966cb41a69 (diff) | |
| parent | 0ff8f60b45552c7c78221f3e47219feafa63eb62 (diff) | |
| download | mariadb-git-5b981a48448d520cdd7c9f9991e5489b06dd319c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-sp-vars-merge-2
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 44deaf1823a..3f4ed137a59 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -660,6 +660,7 @@ bool mysql_assign_to_keycache(THD* thd, TABLE_LIST* table_list, bool mysql_preload_keys(THD* thd, TABLE_LIST* table_list); int reassign_keycache_tables(THD* thd, KEY_CACHE *src_cache, KEY_CACHE *dst_cache); +TABLE *create_virtual_tmp_table(THD *thd, List<create_field> &field_list); bool mysql_xa_recover(THD *thd); @@ -1099,8 +1100,8 @@ void unhex_type2(TYPELIB *lib); uint check_word(TYPELIB *lib, const char *val, const char *end, const char **end_of_word); -bool is_keyword(const char *name, uint len); +bool is_keyword(const char *name, uint len); #define MY_DB_OPT_FILE "db.opt" bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create); |