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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2019-05-05 15:03:48 +03:00
parent b132b8895e e8dd18a474
commit d3dcec5d65
125 changed files with 1950 additions and 1736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_class.h
View File

@ -3239,17 +3239,12 @@ public:
/**
@param id thread identifier
@param is_wsrep_applier thread type
@param skip_lock instruct whether @c LOCK_global_system_variables
is already locked, to not acquire it then.
*/
THD(my_thread_id id, bool is_wsrep_applier= false, bool skip_lock= false);
THD(my_thread_id id, bool is_wsrep_applier= false);
~THD();
/**
@param skip_lock instruct whether @c LOCK_global_system_variables
is already locked, to not acquire it then.
*/
void init(bool skip_lock= false);
void init();
/*
Initialize memory roots necessary for query processing and (!)
pre-allocate memory for it. We can't do that in THD constructor because