diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-02-10 17:01:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-10 17:01:45 +0100 |
| commit | 2195bb4e416232ab807ff67eecf03b1223bf6bff (patch) | |
| tree | 4555af02df68cb0f26d454b1cf65086b62542875 /sql/sql_insert.h | |
| parent | 3ae038b732ce503fb839e9095355e05f5c6866f9 (diff) | |
| parent | bc4686f0f4d17dc57dd727c9f5390caa3022bdca (diff) | |
| download | mariadb-git-2195bb4e416232ab807ff67eecf03b1223bf6bff.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_insert.h')
| -rw-r--r-- | sql/sql_insert.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_insert.h b/sql/sql_insert.h index cbfc1ea9dcd..aea0dac6b0d 100644 --- a/sql/sql_insert.h +++ b/sql/sql_insert.h @@ -27,8 +27,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table, List<Item> &fields, List_item *values, List<Item> &update_fields, List<Item> &update_values, enum_duplicates duplic, - COND **where, bool select_insert, - bool check_fields, bool abort_on_warning); + COND **where, bool select_insert); bool mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields, List<List_item> &values, List<Item> &update_fields, List<Item> &update_values, enum_duplicates flag, |