1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00

Merge branch '10.10' into 10.11

This commit is contained in:
Oleksandr Byelkin
2022-11-02 10:42:34 +01:00
180 changed files with 5673 additions and 2618 deletions

View File

@@ -5110,12 +5110,22 @@ void reset_thd(MYSQL_THD thd)
before writing response to client, to provide durability
guarantees, in other words, server can't send OK packet
before modified data is durable in redo log.
*/
extern "C" void thd_increment_pending_ops(MYSQL_THD thd)
NOTE: system THD (those that are not associated with client
connection) do not allows async operations yet.
@param thd a THD
@return thd
@retval nullptr if this is system THD */
extern "C" MYSQL_THD thd_increment_pending_ops(MYSQL_THD thd)
{
if (!thd || thd->system_thread != NON_SYSTEM_THREAD)
return nullptr;
thd->async_state.inc_pending_ops();
return thd;
}
/**
This function can be used by plugin/engine to indicate
end of async operation (such as end of group commit
@@ -5126,6 +5136,8 @@ extern "C" void thd_increment_pending_ops(MYSQL_THD thd)
extern "C" void thd_decrement_pending_ops(MYSQL_THD thd)
{
DBUG_ASSERT(thd);
DBUG_ASSERT(thd->system_thread == NON_SYSTEM_THREAD);
thd_async_state::enum_async_state state;
if (thd->async_state.dec_pending_ops(&state) == 0)
{