diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:41 +0100 |
| commit | b64fde8f38515dc39e019de26db7624cc0ea7046 (patch) | |
| tree | 0478ea4c3ddeee290f6d381a47efa4f9aded9c0b /sql/debug_sync.cc | |
| parent | a89ee3cd154a67df2231f034fd8339f9225dbe64 (diff) | |
| parent | 1f020299f816263e347c852eb2a494b5ef1cbf0d (diff) | |
| download | mariadb-git-b64fde8f38515dc39e019de26db7624cc0ea7046.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/debug_sync.cc')
| -rw-r--r-- | sql/debug_sync.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index d25c1a75e96..357d8f4ce60 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -584,7 +584,7 @@ static void debug_sync_remove_action(st_debug_sync_control *ds_control, memmove(save_action, action, sizeof(st_debug_sync_action)); /* Move actions down. */ - memmove(ds_control->ds_action + dsp_idx, + memmove((void*)(ds_control->ds_action + dsp_idx), ds_control->ds_action + dsp_idx + 1, (ds_control->ds_active - dsp_idx) * sizeof(st_debug_sync_action)); @@ -595,8 +595,8 @@ static void debug_sync_remove_action(st_debug_sync_control *ds_control, produced by the shift. Again do not use an assignment operator to avoid string allocation/copy. */ - memmove(ds_control->ds_action + ds_control->ds_active, save_action, - sizeof(st_debug_sync_action)); + memmove((void*)(ds_control->ds_action + ds_control->ds_active), + save_action, sizeof(st_debug_sync_action)); } DBUG_VOID_RETURN; |