diff options
| author | sergefp@mysql.com <> | 2004-05-24 21:13:38 +0400 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2004-05-24 21:13:38 +0400 |
| commit | ef260fa754ab4f064127c5795c069412a4e3fadc (patch) | |
| tree | 5d63ab734c1fdc0e1db222f30ea63c47fae38c8c /sql/mysql_priv.h | |
| parent | b142c8edd083b5c3fa37f1b9cef411bc190c0904 (diff) | |
| parent | 1b61cb6d0f5dbea8c3901f509b2f99b4d8c618f4 (diff) | |
| download | mariadb-git-ef260fa754ab4f064127c5795c069412a4e3fadc.tar.gz | |
Merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 13afda816c3..978b8e41930 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -519,13 +519,10 @@ int mysql_alter_table(THD *thd, char *new_db, char *new_name, HA_CREATE_INFO *create_info, TABLE_LIST *table_list, List<create_field> &fields, - List<Key> &keys,List<Alter_drop> &drop_list, - List<Alter_column> &alter_list, - uint order_num, ORDER *order, uint alter_flags, + List<Key> &keys, + uint order_num, ORDER *order, 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); + ALTER_INFO *alter_info); int mysql_create_like_table(THD *thd, TABLE_LIST *table, HA_CREATE_INFO *create_info, Table_ident *src_table); @@ -536,7 +533,7 @@ bool mysql_rename_table(enum db_type base, const char * new_name); 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); + ALTER_INFO *alter_info); int mysql_prepare_update(THD *thd, TABLE_LIST *table_list, TABLE_LIST *update_table_list, Item **conds, uint order_num, ORDER *order); @@ -859,7 +856,7 @@ extern uint protocol_version, mysqld_port, dropping_tables; extern uint delay_key_write_options, lower_case_table_names; extern bool opt_endinfo, using_udf_functions, locked_in_memory; extern bool opt_using_transactions, mysql_embedded; -extern bool using_update_log, opt_large_files; +extern bool using_update_log, opt_large_files, server_id_supplied; extern bool opt_log, opt_update_log, opt_bin_log, opt_slow_log, opt_error_log; extern bool opt_disable_networking, opt_skip_show_db; extern bool volatile abort_loop, shutdown_in_progress, grant_option; |