database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2021-11-29 10:33:06 +02:00
parent 9962cda527 f5441ef4da
commit 289721de9a
40 changed files with 897 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@ -4899,12 +4899,10 @@ inline void add_to_active_threads(THD *thd)
/*
This should be called when you want to delete a thd that was not
running any queries.
This function will assert that the THD is linked.
*/
inline void unlink_not_visible_thd(THD *thd)
{
thd->assert_linked();
mysql_mutex_lock(&LOCK_thread_count);
thd->unlink();
mysql_mutex_unlock(&LOCK_thread_count);
@ -5881,6 +5879,7 @@ public:
bool cmp_int();
bool cmp_decimal();
bool cmp_str();
bool cmp_time();
};
/* EXISTS subselect interface class */