Skip to content

Commit fc673a2

Browse files
committed
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.
1 parent b54566d commit fc673a2

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

storage/innobase/log/log0log.cc

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,17 +1460,7 @@ log_write_up_to(
14601460
}
14611461

14621462
loop:
1463-
#ifdef UNIV_DEBUG
1464-
loop_count++;
1465-
1466-
ut_ad(loop_count < 5);
1467-
1468-
# if 0
1469-
if (loop_count > 2) {
1470-
fprintf(stderr, "Log loop count %lu\n", loop_count);
1471-
}
1472-
# endif
1473-
#endif
1463+
ut_ad(++loop_count < 100);
14741464

14751465
mutex_enter(&(log_sys->mutex));
14761466
ut_ad(!recv_no_log_write);

storage/xtradb/log/log0log.cc

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,17 +1570,7 @@ log_write_up_to(
15701570
}
15711571

15721572
loop:
1573-
#ifdef UNIV_DEBUG
1574-
loop_count++;
1575-
1576-
ut_ad(loop_count < 5);
1577-
1578-
# if 0
1579-
if (loop_count > 2) {
1580-
fprintf(stderr, "Log loop count %lu\n", loop_count);
1581-
}
1582-
# endif
1583-
#endif
1573+
ut_ad(++loop_count < 100);
15841574

15851575
mutex_enter(&(log_sys->mutex));
15861576
ut_ad(!recv_no_log_write);

0 commit comments

Comments
 (0)