diff options
| author | unknown <kostja@bodhi.local> | 2006-07-07 22:09:43 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-07 22:09:43 +0400 |
| commit | f5340f8c7d3798f4cef7bbc3f7dd1173151ef1d0 (patch) | |
| tree | 9baffd6140dc110806fd9c5531adf2e4f85fb6d0 /sql/mysql_priv.h | |
| parent | 5ac016a8147602703aae069c076e6b75a3ab5723 (diff) | |
| parent | 685ccf85d40b39e690e99ef735ce202c876468c3 (diff) | |
| download | mariadb-git-f5340f8c7d3798f4cef7bbc3f7dd1173151ef1d0.tar.gz | |
Merge bodhi.local:/opt/local/work/mysql-5.0-root
into bodhi.local:/opt/local/work/mysql-5.0-runtime
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_update.cc:
Manual merge.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index fcdfe1567e3..324542ebe0a 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -727,9 +727,7 @@ bool mysql_alter_table(THD *thd, char *new_db, char *new_name, TABLE_LIST *table_list, List<create_field> &fields, List<Key> &keys, - uint order_num, ORDER *order, - enum enum_duplicates handle_duplicates, - bool ignore, + uint order_num, ORDER *order, bool ignore, ALTER_INFO *alter_info, bool do_send_ok); bool mysql_recreate_table(THD *thd, TABLE_LIST *table_list, bool do_send_ok); bool mysql_create_like_table(THD *thd, TABLE_LIST *table, @@ -765,6 +763,8 @@ bool mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields, bool ignore); int check_that_all_fields_are_given_values(THD *thd, TABLE *entry, TABLE_LIST *table_list); +void mark_fields_used_by_triggers_for_insert_stmt(THD *thd, TABLE *table, + enum_duplicates duplic); bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds); bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order, ha_rows rows, ulonglong options, |