diff options
| author | unknown <ingo@mysql.com> | 2005-12-07 19:47:55 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-12-07 19:47:55 +0100 |
| commit | e2bf3b211b093161c3f4925c964d818ad3ae375f (patch) | |
| tree | e8539b73dd37a08a46aab2d646d823736fa563aa /sql/mysql_priv.h | |
| parent | 02f90923cf51ad0df6c73b9348123bb8c54291ff (diff) | |
| parent | 5213f5894a043b74f12d2be1a43e30de3d5e6b69 (diff) | |
| download | mariadb-git-e2bf3b211b093161c3f4925c964d818ad3ae375f.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug10932
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
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 9f391bf26c8..7575faadef4 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -664,6 +664,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); @@ -1103,8 +1104,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); |