database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.10' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-11-02 10:42:34 +01:00
parent 093ec49b6b 49a22c5897
commit ad937cf33a
180 changed files with 5673 additions and 2618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.h
View File

@@ -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
@@ -6148,7 +6145,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();
@@ -6192,7 +6189,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; }