diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 10:04:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 10:04:37 +0300 |
| commit | 667d3fbbb51044b20d23150992adbbad1f04aad8 (patch) | |
| tree | 6bf1006a9ea5e68f18387205bd224e7c5698278f /sql/sql_class.h | |
| parent | f19e8559aa3f46c0be427c9bd6534432bc08160c (diff) | |
| parent | 34ff5ca8952ff58d99be5028a5920bfe5268f17a (diff) | |
| download | mariadb-git-667d3fbbb51044b20d23150992adbbad1f04aad8.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 3479ed1a7bc..b390c909685 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5626,7 +5626,7 @@ class select_insert :public select_result_interceptor { int prepare(List<Item> &list, SELECT_LEX_UNIT *u); virtual int prepare2(JOIN *join); virtual int send_data(List<Item> &items); - virtual void store_values(List<Item> &values); + virtual bool store_values(List<Item> &values, bool ignore_errors); virtual bool can_rollback_data() { return 0; } bool prepare_eof(); bool send_ok_packet(); @@ -5668,7 +5668,7 @@ public: int prepare(List<Item> &list, SELECT_LEX_UNIT *u); int binlog_show_create_table(TABLE **tables, uint count); - void store_values(List<Item> &values); + bool store_values(List<Item> &values, bool ignore_errors); bool send_eof(); virtual void abort_result_set(); virtual bool can_rollback_data() { return 1; } |