Merge 10.0 into 10.1

ef065dbb · Marko Mäkelä · 03400676 · 6011fb6d · ef065dbb · ef065dbb
Commit ef065dbb authored Feb 09, 2017 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/innobase/srv/srv0srv.cc storage/innobase/srv/srv0srv.cc +1 -1

storage/xtradb/srv/srv0srv.cc storage/xtradb/srv/srv0srv.cc +1 -1

No files found.
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -900,7 +900,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;

--- a/storage/xtradb/srv/srv0srv.cc
+++ b/storage/xtradb/srv/srv0srv.cc
@@ -1058,7 +1058,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;