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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 15:57:05 +01:00
parent 2a4c573339 6cfd2ba397
commit b83c379420
381 changed files with 10233 additions and 5782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/backup.cc
View File

@@ -311,6 +311,7 @@ static bool backup_block_ddl(THD *thd)
if (server_state.desync_and_pause().is_undefined()) {
DBUG_RETURN(1);
}
DEBUG_SYNC(thd, "wsrep_backup_stage_after_desync_and_pause");
thd->wsrep_desynced_backup_stage= true;
}
else
@@ -430,6 +431,7 @@ bool backup_end(THD *thd)
Wsrep_server_state &server_state= Wsrep_server_state::instance();
server_state.resume_and_resync();
thd->wsrep_desynced_backup_stage= false;
DEBUG_SYNC(thd, "wsrep_backup_stage_after_resume_and_resync");
}
#endif /* WITH_WSREP */
}