diff options
| author | malff/marcsql@weblab.(none) <> | 2007-06-11 15:57:59 -0600 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-06-11 15:57:59 -0600 |
| commit | e6f9d712aa1f167ffc38c6b6102daad6ae20c5f9 (patch) | |
| tree | 727483fa8379480249287861113bba713dc46a69 /sql/mysql_priv.h | |
| parent | ee116570dc44bdb95a95fc04b27dfb1171ec85d7 (diff) | |
| parent | 041c7797a9e2ba7d17ff6da15bfc452fd8ab5324 (diff) | |
| download | mariadb-git-e6f9d712aa1f167ffc38c6b6102daad6ae20c5f9.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7fb4d95f1f6..1c961cf917f 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -908,7 +908,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); +TABLE *create_virtual_tmp_table(THD *thd, List<Create_field> &field_list); bool mysql_xa_recover(THD *thd); @@ -952,8 +952,8 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, bool table_cant_handle_bit_fields, bool make_copy_field, uint convert_blob_length); -void sp_prepare_create_field(THD *thd, create_field *sql_field); -int prepare_create_field(create_field *sql_field, +void sp_prepare_create_field(THD *thd, Create_field *sql_field); +int prepare_create_field(Create_field *sql_field, uint *blob_columns, int *timestamps, int *timestamps_with_niladic, longlong table_flags); @@ -1178,7 +1178,7 @@ bool add_field_to_list(THD *thd, LEX_STRING *field_name, enum enum_field_types t char *change, List<String> *interval_list, CHARSET_INFO *cs, uint uint_geom_type); -create_field * new_create_field(THD *thd, char *field_name, enum_field_types type, +Create_field * new_create_field(THD *thd, char *field_name, enum_field_types type, char *length, char *decimals, uint type_modifier, Item *default_value, Item *on_update_value, @@ -1803,12 +1803,12 @@ void unireg_end(void) __attribute__((noreturn)); bool mysql_create_frm(THD *thd, const char *file_name, const char *db, const char *table, HA_CREATE_INFO *create_info, - List<create_field> &create_field, + List<Create_field> &create_field, uint key_count,KEY *key_info,handler *db_type); int rea_create_table(THD *thd, const char *path, const char *db, const char *table_name, HA_CREATE_INFO *create_info, - List<create_field> &create_field, + List<Create_field> &create_field, uint key_count,KEY *key_info, handler *file); int format_number(uint inputflag,uint max_length,char * pos,uint length, |