Skip to content

M
MariaDB
Commit ef065dbb authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.0 into 10.1

parents 03400676 6011fb6d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/innobase/srv/srv0srv.cc
View file @ ef065dbb
...@@ -900,7 +900,7 @@ srv_suspend_thread( ...@@ -900,7 +900,7 @@ srv_suspend_thread(
@return whether the wait timed out */ @return whether the wait timed out */
static static
bool 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) ulint timeout_usec = 0)
{ {
bool timeout; bool timeout;
......
storage/xtradb/srv/srv0srv.cc
View file @ ef065dbb
...@@ -1058,7 +1058,7 @@ srv_suspend_thread( ...@@ -1058,7 +1058,7 @@ srv_suspend_thread(
@return whether the wait timed out */ @return whether the wait timed out */
static static
bool 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) ulint timeout_usec = 0)
{ {
bool timeout; bool timeout;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7