From 6011fb6daa5ac9e6cb97a23b877e4d2568c85d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 9 Feb 2017 08:47:38 +0200 Subject: [PATCH] Post-push fix for MDEV-11947 InnoDB purge workers fail to shut down Use the ib_int64_t type alias instead of the standard type int64_t, so that the code will compile on Microsoft Visual Studio 2013. --- storage/innobase/srv/srv0srv.cc | 2 +- storage/xtradb/srv/srv0srv.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index cc69065ff249f..effe662611948 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -841,7 +841,7 @@ srv_suspend_thread( @return whether the wait timed out */ static bool -srv_resume_thread(srv_slot_t* slot, int64_t sig_count = 0, bool wait = true, +srv_resume_thread(srv_slot_t* slot, ib_int64_t sig_count = 0, bool wait = true, ulint timeout_usec = 0) { bool timeout; diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc index a6dc9a0140792..c675649d40cb5 100644 --- a/storage/xtradb/srv/srv0srv.cc +++ b/storage/xtradb/srv/srv0srv.cc @@ -991,7 +991,7 @@ srv_suspend_thread( @return whether the wait timed out */ static bool -srv_resume_thread(srv_slot_t* slot, int64_t sig_count = 0, bool wait = true, +srv_resume_thread(srv_slot_t* slot, ib_int64_t sig_count = 0, bool wait = true, ulint timeout_usec = 0) { bool timeout;