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.
MariaDB · Apr 10, 2018 · 2e91eb7 · janlindstrom · Apr 11, 2018 · 2e91eb7
1 parent 1fd07d2
commit 2e91eb7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
@@ -3244,8 +3244,8 @@ logs_empty_and_mark_files_at_shutdown(void)
 		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 @@ logs_empty_and_mark_files_at_shutdown(void)
 		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
@@ -3560,8 +3560,8 @@ logs_empty_and_mark_files_at_shutdown(void)
 		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 @@ logs_empty_and_mark_files_at_shutdown(void)
 		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);