Skip to content

Commit 2e91eb7

Browse files
committed
Fix warnings in InnoDB & XtraDB post MDEV-14705
There was a missing argument to service_manager_extend_timeout call and the signness of arguments did not match.
1 parent 1fd07d2 commit 2e91eb7

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

storage/innobase/log/log0log.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,8 +3244,8 @@ logs_empty_and_mark_files_at_shutdown(void)
32443244
os_event_set(lock_sys->timeout_event);
32453245
os_event_set(dict_stats_event);
32463246
}
3247-
#define COUNT_INTERVAL 600
3248-
#define CHECK_INTERVAL 100000
3247+
#define COUNT_INTERVAL 600U
3248+
#define CHECK_INTERVAL 100000U
32493249
os_thread_sleep(CHECK_INTERVAL);
32503250

32513251
count++;
@@ -3261,7 +3261,8 @@ logs_empty_and_mark_files_at_shutdown(void)
32613261
if (srv_print_verbose_log && count > COUNT_INTERVAL) {
32623262
service_manager_extend_timeout(
32633263
COUNT_INTERVAL * CHECK_INTERVAL/1000000 * 2,
3264-
"Waiting for %lu active transactions to finish");
3264+
"Waiting for %lu active transactions to finish",
3265+
(ulong) total_trx);
32653266
ib_logf(IB_LOG_LEVEL_INFO,
32663267
"Waiting for %lu active transactions to finish",
32673268
(ulong) total_trx);

storage/xtradb/log/log0log.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3560,8 +3560,8 @@ logs_empty_and_mark_files_at_shutdown(void)
35603560
os_event_set(lock_sys->timeout_event);
35613561
os_event_set(dict_stats_event);
35623562
}
3563-
#define COUNT_INTERVAL 600
3564-
#define CHECK_INTERVAL 100000
3563+
#define COUNT_INTERVAL 600U
3564+
#define CHECK_INTERVAL 100000U
35653565
os_thread_sleep(CHECK_INTERVAL);
35663566

35673567
count++;
@@ -3577,7 +3577,8 @@ logs_empty_and_mark_files_at_shutdown(void)
35773577
if (srv_print_verbose_log && count > COUNT_INTERVAL) {
35783578
service_manager_extend_timeout(
35793579
COUNT_INTERVAL * CHECK_INTERVAL/1000000 * 2,
3580-
"Waiting for %lu active transactions to finish");
3580+
"Waiting for %lu active transactions to finish",
3581+
(ulong) total_trx);
35813582
ib_logf(IB_LOG_LEVEL_INFO,
35823583
"Waiting for %lu active transactions to finish",
35833584
(ulong) total_trx);

0 commit comments

Comments
 (0)