diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 16:11:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 16:11:26 +0200 |
| commit | 3157fa182accab86a4dea45edbcbca4eb5157723 (patch) | |
| tree | 9ba82e0c489eb91efbf1e5863c5a98a29b5ea8c3 /storage/innobase/row/row0merge.cc | |
| parent | 480a06718d137c9ee7784012ccb609b9e79ff08c (diff) | |
| parent | 48141f3c1787de941d969ad1e6675611b2b650c2 (diff) | |
| download | mariadb-git-3157fa182accab86a4dea45edbcbca4eb5157723.tar.gz | |
Merge 10.2 into 10.3
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 484676aa08d..7a9c2cd9240 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -4862,10 +4862,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()); |