diff options
| author | unknown <monty@mysql.com> | 2004-04-08 17:56:45 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-08 17:56:45 +0300 |
| commit | 10e15762b8e38ae09d89e6489de6f2fe68cfd85e (patch) | |
| tree | 1eb8cd825c2490f5f90d6e08cd2b0338ce489853 /sql/mysql_priv.h | |
| parent | 46bd7be2409e80b36de3cd0d49af33557ffa74a9 (diff) | |
| download | mariadb-git-10e15762b8e38ae09d89e6489de6f2fe68cfd85e.tar.gz | |
Don't enable HA_EXTRA_WRITE_CACHE if too few rows
Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()
sql/ha_myisam.cc:
Don't enable HA_EXTRA_WRITE_CACHE if too few rows
sql/handler.h:
Indentaion fix
sql/mysql_priv.h:
Removed real_alter_table, mysql_add_column and mysql_drop_column
sql/sql_class.cc:
After merge fix
sql/sql_insert.cc:
Don't user bulk_insert if only one row (common case)
sql/sql_parse.cc:
Added mysql_create_index() and mysql_drop_index() as these are only wrappers for mysql_alter_table()
sql/sql_table.cc:
Revert main parts of patch for online index builds
Changed back to use tabs to make merges possible between trees
sql/unireg.cc:
Added comments and minor cleanup
strings/my_vsnprintf.c:
Added support for %lx.
Proper long support
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 8c22aa6a110..bd9a94a969b 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -509,23 +509,11 @@ int mysql_alter_table(THD *thd, char *new_db, char *new_name, List<create_field> &fields, List<Key> &keys,List<Alter_drop> &drop_list, List<Alter_column> &alter_list, - uint order_num, ORDER *order, int alter_flags, + uint order_num, ORDER *order, uint alter_flags, enum enum_duplicates handle_duplicates, enum enum_enable_or_disable keys_onoff=LEAVE_AS_IS, enum tablespace_op_type tablespace_op=NO_TABLESPACE_OP, bool simple_alter=0); -int real_alter_table(THD *thd, char *new_db, char *new_name, - HA_CREATE_INFO *create_info, - TABLE_LIST *table_list, - TABLE *table, - List<create_field> &fields, - List<Key> &keys,List<Alter_drop> &drop_list, - List<Alter_column> &alter_list, - uint order_num, ORDER *order, int alter_flags, - enum enum_duplicates handle_duplicates, - enum enum_enable_or_disable keys_onoff=LEAVE_AS_IS, - enum tablespace_op_type tablespace_op=NO_TABLESPACE_OP, - bool simple_alter=0); int mysql_create_like_table(THD *thd, TABLE_LIST *table, HA_CREATE_INFO *create_info, Table_ident *src_table); @@ -537,10 +525,6 @@ bool mysql_rename_table(enum db_type base, int mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys); int mysql_drop_index(THD *thd, TABLE_LIST *table_list, List<Alter_drop> &drop_list); -int mysql_add_column(THD *thd, TABLE_LIST *table_list, - List<create_field> &fields); -int mysql_drop_column(THD *thd, TABLE_LIST *table_list, - List<Alter_drop> &drop_list); int mysql_update(THD *thd,TABLE_LIST *tables,List<Item> &fields, List<Item> &values,COND *conds, uint order_num, ORDER *order, ha_rows limit, @@ -944,9 +928,10 @@ void unlock_table_names(THD *thd, TABLE_LIST *table_list, void unireg_init(ulong options); void unireg_end(void); -int mysql_create_frm(THD *thd, my_string file_name,HA_CREATE_INFO *create_info, - List<create_field> &create_field, - uint key_count,KEY *key_info,handler *db_type); +bool mysql_create_frm(THD *thd, my_string file_name, + HA_CREATE_INFO *create_info, + List<create_field> &create_field, + uint key_count,KEY *key_info,handler *db_type); int rea_create_table(THD *thd, my_string file_name,HA_CREATE_INFO *create_info, List<create_field> &create_field, uint key_count,KEY *key_info); |