Merge 10.0 into 10.1

MariaDB · Feb 9, 2017 · ef065db · ef065db
2 parents 0340067 + 6011fb6
commit ef065db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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;

diff --git 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;