From 64d26ec52af54f9595ee51c4831bc25d66b03fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 18 Oct 2018 12:15:07 +0300 Subject: [PATCH] Fix the Windows build On Windows, a mismatch between TIMETPF ("%ld") and time_t would be reported. Use "%ld" and long, like the code used to be. --- storage/innobase/btr/btr0scrub.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/btr/btr0scrub.cc b/storage/innobase/btr/btr0scrub.cc index 64deeab8332..376a106bf8a 100644 --- a/storage/innobase/btr/btr0scrub.cc +++ b/storage/innobase/btr/btr0scrub.cc @@ -147,10 +147,10 @@ btr_scrub_lock_dict_func(ulint space_id, bool lock_to_close_table, if (now >= last + 30) { fprintf(stderr, - "WARNING: %s:%u waited " TIMETPF " seconds for" + "WARNING: %s:%u waited %ld seconds for" " dict_sys lock, space: " ULINTPF " lock_to_close_table: %d\n", - file, line, now - start, space_id, + file, line, long(now - start), space_id, lock_to_close_table); last = now;