1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings in InnoDB & XtraDB post MDEV-14705

Browse Source 
There was a missing argument to service_manager_extend_timeout call
and the signness of arguments did not match.
This commit is contained in:
Vicențiu Ciorbaru 2018-04-10 17:34:56 +03:00
parent 1fd07d21a7
commit 2e91eb7547
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
storage/innobase/log/log0log.cc
View File

@ -3244,8 +3244,8 @@ loop:
os_event_set(lock_sys->timeout_event);
os_event_set(dict_stats_event);
}
#define COUNT_INTERVAL 600
#define CHECK_INTERVAL 100000
#define COUNT_INTERVAL 600U
#define CHECK_INTERVAL 100000U
os_thread_sleep(CHECK_INTERVAL);
count++;
@ -3261,7 +3261,8 @@ loop:
if (srv_print_verbose_log && count > COUNT_INTERVAL) {
service_manager_extend_timeout(
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,
"Waiting for %lu active transactions to finish",
(ulong) total_trx);

7
storage/xtradb/log/log0log.cc
View File

@ -3560,8 +3560,8 @@ loop:
os_event_set(lock_sys->timeout_event);
os_event_set(dict_stats_event);
}
#define COUNT_INTERVAL 600
#define CHECK_INTERVAL 100000
#define COUNT_INTERVAL 600U
#define CHECK_INTERVAL 100000U
os_thread_sleep(CHECK_INTERVAL);
count++;
@ -3577,7 +3577,8 @@ loop:
if (srv_print_verbose_log && count > COUNT_INTERVAL) {
service_manager_extend_timeout(
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,
"Waiting for %lu active transactions to finish",
(ulong) total_trx);