diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:34:56 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:34:56 +0300 |
| commit | 2e91eb7547dfc7c9a999568bd8245832bbcfefaa (patch) | |
| tree | 89c1998ec589ddea0c38005cacec4f8ecf6eb9d0 | |
| parent | 1fd07d21a72ca4c2a5a628bd18af347776ca9b96 (diff) | |
| download | mariadb-git-2e91eb7547dfc7c9a999568bd8245832bbcfefaa.tar.gz | |
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.
| -rw-r--r-- | storage/innobase/log/log0log.cc | 7 | ||||
| -rw-r--r-- | storage/xtradb/log/log0log.cc | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc index 112ab80dc83..3d9fa801e52 100644 --- a/storage/innobase/log/log0log.cc +++ b/storage/innobase/log/log0log.cc @@ -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); diff --git a/storage/xtradb/log/log0log.cc b/storage/xtradb/log/log0log.cc index d25d15111d1..cb61e3fb0c6 100644 --- a/storage/xtradb/log/log0log.cc +++ b/storage/xtradb/log/log0log.cc @@ -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); |