diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 11:26:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-25 11:26:37 +0300 |
| commit | 9a0b9e336081619d88211d17895e3e7f8030ab3f (patch) | |
| tree | dff672703c5309b1e34227330ea027ab13e6c29a /sql/sql_class.h | |
| parent | 2f7a0072b6f343051fc2dbd77ea46519617b94ab (diff) | |
| parent | 667d3fbbb51044b20d23150992adbbad1f04aad8 (diff) | |
| download | mariadb-git-9a0b9e336081619d88211d17895e3e7f8030ab3f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 273b53e4227..08e83adb85f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5838,7 +5838,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(); @@ -5879,7 +5879,8 @@ public: {} int prepare(List<Item> &list, SELECT_LEX_UNIT *u); - void store_values(List<Item> &values); + int binlog_show_create_table(TABLE **tables, uint count); + bool store_values(List<Item> &values, bool ignore_errors); bool send_eof(); virtual void abort_result_set(); virtual bool can_rollback_data() { return 1; } |