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

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-08-03 13:41:29 +02:00
parent 4d41f316c3 555c6632c6
commit c32f71af7e
109 changed files with 1448 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/debug_sync.cc
View File

@ -33,7 +33,7 @@
/*
Action to perform at a synchronization point.
NOTE: This structure is moved around in memory by realloc(), qsort(),
and memmove(). Do not add objects with non-trivial constuctors
and memmove(). Do not add objects with non-trivial constructors
or destructors, which might prevent moving of this structure
with these functions.
*/
@ -542,7 +542,7 @@ static void debug_sync_reset(THD *thd)
@description
Removing an action mainly means to decrement the ds_active counter.
But if the action is between other active action in the array, then
the array needs to be shrinked. The active actions above the one to
the array needs to be shrunk. The active actions above the one to
be removed have to be moved down by one slot.
*/