summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2002-12-02 20:38:00 +0100
committerunknown <serg@serg.mysql.com>2002-12-02 20:38:00 +0100
commit0029b4e7941c48ab0033491e7bd278abff09951b (patch)
treedef5561a631f2faec95f4e40d65e292ef8067f19 /sql/mysql_priv.h
parent0859f671bd6a5a4c4c89e484a97f2bfcb099e8d3 (diff)
downloadmariadb-git-0029b4e7941c48ab0033491e7bd278abff09951b.tar.gz
INSERT ... ON DUPLICATE KEY UPDATE ...
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 242f8601b23..94065599fc8 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -429,7 +429,7 @@ int mysql_alter_table(THD *thd, char *new_db, char *new_name,
bool drop_primary,
enum enum_duplicates handle_duplicates,
enum enum_enable_or_disable keys_onoff=LEAVE_AS_IS,
- bool simple_alter=0);
+ bool simple_alter=0);
bool mysql_rename_table(enum db_type base,
const char *old_db,
const char * old_name,
@@ -440,11 +440,12 @@ 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_update(THD *thd,TABLE_LIST *tables,List<Item> &fields,
- List<Item> &values,COND *conds,
+ List<Item> &values,COND *conds,
ORDER *order, ha_rows limit,
enum enum_duplicates handle_duplicates);
int mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields,
- List<List_item> &values, enum_duplicates flag);
+ List<List_item> &values, List<Item> &update_fields,
+ List<Item> &update_values, enum_duplicates flag);
void kill_delayed_threads(void);
int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, ORDER *order,
ha_rows rows, ulong options);