diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-04 17:24:15 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-04 17:24:15 +0200 |
commit | 48b5777ebda9bf14c60ad05298dac67933e9799f (patch) | |
tree | 2c023b5cc7811faea8a9b4ad82998e4624c29068 /sql/debug_sync.cc | |
parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
parent | 9a156e1a23046ba3e37bdb1e4e1ad887d3f5829b (diff) | |
download | mariadb-git-48b5777ebda9bf14c60ad05298dac67933e9799f.tar.gz |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/debug_sync.cc')
-rw-r--r-- | sql/debug_sync.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index 2fc2e00d043..d2656f36967 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -34,7 +34,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. */ @@ -571,7 +571,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. */ |