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.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-08-31 15:07:39 +03:00
parent 58aaa67064 55a344ffa3
commit 2e64145921
201 changed files with 4243 additions and 4063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@ -5017,13 +5017,9 @@ void reset_thd(MYSQL_THD thd)
guarantees, in other words, server can't send OK packet
before modified data is durable in redo log.
*/
extern "C" MYSQL_THD thd_increment_pending_ops(void)
extern "C" void thd_increment_pending_ops(MYSQL_THD thd)
{
THD *thd = current_thd;
if (!thd)
return NULL;
thd->async_state.inc_pending_ops();
return thd;
}
/**