diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 10:42:22 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-11-01 11:55:28 +0100 |
| commit | 49a22c5897823c528d52886f6048d5b4c91e221f (patch) | |
| tree | 92eedca678276458a7c4e27f357acd12d4fdcbac /sql/sql_class.h | |
| parent | 8e6a64194b76a199b0bbf2edc9a4e9facda8da2c (diff) | |
| parent | ebf2121529fcf06971b4c0fc28f40654ef8dd99f (diff) | |
| download | mariadb-git-49a22c5897823c528d52886f6048d5b4c91e221f.tar.gz | |
Merge branch '10.9' into 10.10
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 882b40c474c..0ccd695788f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2571,9 +2571,6 @@ struct thd_async_state } }; -extern "C" void thd_increment_pending_ops(MYSQL_THD); -extern "C" void thd_decrement_pending_ops(MYSQL_THD); - /** @class THD @@ -6127,7 +6124,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(); @@ -6173,7 +6170,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; } |