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

Merge branch '11.1' into 11.2

Browse Source
This commit is contained in:
Sergei Golubchik
2023-08-17 17:27:05 +02:00
parent 8aa1a9e6a7 9bc25d9820
commit 18ddde4826
879 changed files with 12425 additions and 6297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/log.cc
View File

@ -8398,7 +8398,7 @@ MYSQL_BIN_LOG::queue_for_group_commit(group_commit_entry *orig_entry)
Setting this flag may or may not be seen by the other thread, but we
are safe in any case: The other thread will set queued_by_other under
its LOCK_wait_commit, and we will not check queued_by_other only after
its LOCK_wait_commit, and we will not check queued_by_other until after
we have been woken up.
*/
wfc->opaque_pointer= orig_entry;
@ -8495,7 +8495,7 @@ MYSQL_BIN_LOG::queue_for_group_commit(group_commit_entry *orig_entry)
is pointed to by `last` (we do not use NULL to terminate the list).
As we process an entry, any waiters for that entry are added at the end of
the list, to be processed in subsequent iterations. The the entry is added
the list, to be processed in subsequent iterations. Then the entry is added
to the group_commit_queue. This continues until the list is exhausted,
with all entries ever added eventually processed.
@ -12386,7 +12386,7 @@ get_gtid_list_event(IO_CACHE *cache, Gtid_list_log_event **out_gtid_list)
if (fdle->start_decryption((Start_encryption_log_event*) ev))
{
errormsg= "Could not set up decryption for binlog.";
break;
typ= UNKNOWN_EVENT; // to cleanup and abort below
}
}
delete ev;