diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-04-26 14:11:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-26 14:11:09 +0200 |
| commit | 15ec8c2f28f08517ecbffb959d756b4bdd53ab45 (patch) | |
| tree | eea0aeec5fcff4946eb4838629745e3b6ca901d8 /storage/innobase/row/row0log.cc | |
| parent | 619afb151b38a538ef64d5387643c01f86e203d8 (diff) | |
| parent | 5883c6905b5345be55f3c1a1efbd741bb697b115 (diff) | |
| download | mariadb-git-15ec8c2f28f08517ecbffb959d756b4bdd53ab45.tar.gz | |
Merge branch 'merge-innodb-5.6' into 10.0
Diffstat (limited to 'storage/innobase/row/row0log.cc')
| -rw-r--r-- | storage/innobase/row/row0log.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc index 0720b3ee8c4..62ca32b712c 100644 --- a/storage/innobase/row/row0log.cc +++ b/storage/innobase/row/row0log.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2011, 2018, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2017, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under @@ -2724,7 +2724,15 @@ all_done: while (!trx_is_interrupted(trx)) { mrec = next_mrec; - ut_ad(mrec < mrec_end); + ut_ad(mrec <= mrec_end); + + if (mrec == mrec_end) { + /* We are at the end of the log. + Mark the replay all_done. */ + if (has_index_lock) { + goto all_done; + } + } if (!has_index_lock) { /* We are applying operations from a different |