diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:12:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:12:28 +0200 |
| commit | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (patch) | |
| tree | 792d8852dd9aaa06b5ddfb374f02774b18ed150c /storage/innobase/row/row0merge.cc | |
| parent | d1ff2c583f452d8e1899f800609c329c998f0a33 (diff) | |
| parent | 3157fa182accab86a4dea45edbcbca4eb5157723 (diff) | |
| download | mariadb-git-7ae37ff74fc18c391bd0d3fd1fbf6afafe966435.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index a0dd06f3ddf..72b33c127de 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -4857,10 +4857,6 @@ wait_again: buf, i + 1, n_indexes); } - DBUG_EXECUTE_IF( - "ib_merge_wait_after_sort", - os_thread_sleep(20000000);); /* 20 sec */ - if (error == DB_SUCCESS) { BtrBulk btr_bulk(sort_idx, trx, trx->get_flush_observer()); |