diff options
| author | anozdrin@mysql.com <> | 2005-12-09 15:14:19 +0300 |
|---|---|---|
| committer | anozdrin@mysql.com <> | 2005-12-09 15:14:19 +0300 |
| commit | 5d105fb7e736708c13cc76284a44ae6ba1a7ae0b (patch) | |
| tree | e8d8d0e4221b70994cc2102da16ba5febf0e3f48 /sql/mysql_priv.h | |
| parent | 081b2cc6c8e59666da4d4a5da6e5d22e93fe3fcc (diff) | |
| parent | b867ef6df010e1fdc9da4c20f8c0fa56147ae7b5 (diff) | |
| download | mariadb-git-5d105fb7e736708c13cc76284a44ae6ba1a7ae0b.tar.gz | |
Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
into mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
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 cf88f4cd61e..15297f46e00 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -686,6 +686,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); @@ -1138,8 +1139,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); |