diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2023-01-10 21:04:17 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2023-01-10 21:04:17 +0100 |
| commit | fdcfc251271c2c0d29d77c7fe7cee356f16f2db5 (patch) | |
| tree | 4665f47d2da9c38db37dfd630199b142ec5ccc08 /sql/sql_class.h | |
| parent | 6cb84346e1bde63ec79dd5e3a7d80f69bb106ead (diff) | |
| parent | 56948ee54c9d113f07f725ebdc560d1919fc6676 (diff) | |
| download | mariadb-git-fdcfc251271c2c0d29d77c7fe7cee356f16f2db5.tar.gz | |
Merge branch '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 3abd9b9308d..136380bbd87 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 bool store_values(List<Item> &values, bool ignore_errors); + virtual bool store_values(List<Item> &values); 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); - bool store_values(List<Item> &values, bool ignore_errors); + bool store_values(List<Item> &values); bool send_eof(); virtual void abort_result_set(); virtual bool can_rollback_data() { return 1; } |