Commit 2e91eb75 authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru

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.
parent 1fd07d21
...@@ -3244,8 +3244,8 @@ logs_empty_and_mark_files_at_shutdown(void) ...@@ -3244,8 +3244,8 @@ logs_empty_and_mark_files_at_shutdown(void)
os_event_set(lock_sys->timeout_event); os_event_set(lock_sys->timeout_event);
os_event_set(dict_stats_event); os_event_set(dict_stats_event);
} }
#define COUNT_INTERVAL 600 #define COUNT_INTERVAL 600U
#define CHECK_INTERVAL 100000 #define CHECK_INTERVAL 100000U
os_thread_sleep(CHECK_INTERVAL); os_thread_sleep(CHECK_INTERVAL);
count++; count++;
...@@ -3261,7 +3261,8 @@ logs_empty_and_mark_files_at_shutdown(void) ...@@ -3261,7 +3261,8 @@ logs_empty_and_mark_files_at_shutdown(void)
if (srv_print_verbose_log && count > COUNT_INTERVAL) { if (srv_print_verbose_log && count > COUNT_INTERVAL) {
service_manager_extend_timeout( service_manager_extend_timeout(
COUNT_INTERVAL * CHECK_INTERVAL/1000000 * 2, COUNT_INTERVAL * CHECK_INTERVAL/1000000 * 2,
"Waiting for %lu active transactions to finish"); "Waiting for %lu active transactions to finish",
(ulong) total_trx);
ib_logf(IB_LOG_LEVEL_INFO, ib_logf(IB_LOG_LEVEL_INFO,
"Waiting for %lu active transactions to finish", "Waiting for %lu active transactions to finish",
(ulong) total_trx); (ulong) total_trx);
......
...@@ -3560,8 +3560,8 @@ logs_empty_and_mark_files_at_shutdown(void) ...@@ -3560,8 +3560,8 @@ logs_empty_and_mark_files_at_shutdown(void)
os_event_set(lock_sys->timeout_event); os_event_set(lock_sys->timeout_event);
os_event_set(dict_stats_event); os_event_set(dict_stats_event);
} }
#define COUNT_INTERVAL 600 #define COUNT_INTERVAL 600U
#define CHECK_INTERVAL 100000 #define CHECK_INTERVAL 100000U
os_thread_sleep(CHECK_INTERVAL); os_thread_sleep(CHECK_INTERVAL);
count++; count++;
...@@ -3577,7 +3577,8 @@ logs_empty_and_mark_files_at_shutdown(void) ...@@ -3577,7 +3577,8 @@ logs_empty_and_mark_files_at_shutdown(void)
if (srv_print_verbose_log && count > COUNT_INTERVAL) { if (srv_print_verbose_log && count > COUNT_INTERVAL) {
service_manager_extend_timeout( service_manager_extend_timeout(
COUNT_INTERVAL * CHECK_INTERVAL/1000000 * 2, COUNT_INTERVAL * CHECK_INTERVAL/1000000 * 2,
"Waiting for %lu active transactions to finish"); "Waiting for %lu active transactions to finish",
(ulong) total_trx);
ib_logf(IB_LOG_LEVEL_INFO, ib_logf(IB_LOG_LEVEL_INFO,
"Waiting for %lu active transactions to finish", "Waiting for %lu active transactions to finish",
(ulong) total_trx); (ulong) total_trx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment