diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-28 09:54:12 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-28 09:54:12 +0200 |
| commit | fc673a2c121f524a7ed4101b8b9a0cedf8d6fd58 (patch) | |
| tree | 1af4e9285ef0bbeb7bd62430814b9f113e618c60 | |
| parent | b54566d73bb96ef9eb7d734742d3743fb3369a40 (diff) | |
| download | mariadb-git-fc673a2c121f524a7ed4101b8b9a0cedf8d6fd58.tar.gz | |
MDEV-12127 InnoDB: Assertion failure loop_count < 5 in file log0log.cc
As suggested in MySQL Bug#58536, increase the limit in this
debug assertion in order to avoid false positives on heavily
loaded systems.
| -rw-r--r-- | storage/innobase/log/log0log.cc | 12 | ||||
| -rw-r--r-- | storage/xtradb/log/log0log.cc | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 89c4ed2d7bf..57516d7c8f4 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -1460,17 +1460,7 @@ log_write_up_to( } loop: -#ifdef UNIV_DEBUG - loop_count++; - - ut_ad(loop_count < 5); - -# if 0 - if (loop_count > 2) { - fprintf(stderr, "Log loop count %lu\n", loop_count); - } -# endif -#endif + ut_ad(++loop_count < 100); mutex_enter(&(log_sys->mutex)); ut_ad(!recv_no_log_write); diff --git a/storage/xtradb/log/log0log.cc b/storage/xtradb/log/log0log.cc index c39f108b1de..b39a8ed1829 100644 --- a/storage/xtradb/log/log0log.cc +++ b/storage/xtradb/log/log0log.cc @@ -1570,17 +1570,7 @@ log_write_up_to( } loop: -#ifdef UNIV_DEBUG - loop_count++; - - ut_ad(loop_count < 5); - -# if 0 - if (loop_count > 2) { - fprintf(stderr, "Log loop count %lu\n", loop_count); - } -# endif -#endif + ut_ad(++loop_count < 100); mutex_enter(&(log_sys->mutex)); ut_ad(!recv_no_log_write); |