Skip to content
Permalink
Browse files

Merge 10.0 into 10.1

  • Loading branch information...
dr-m committed Feb 9, 2017
2 parents 0340067 + 6011fb6 commit ef065dbbc2dd93ccf7db7ba677e70890a4a49aa6
Showing with 2 additions and 2 deletions.
  1. +1 −1 storage/innobase/srv/srv0srv.cc
  2. +1 −1 storage/xtradb/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;
@@ -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;

0 comments on commit ef065db

Please sign in to comment.
You can’t perform that action at this time.