diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-09 08:47:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-09 08:47:38 +0200 |
| commit | 6011fb6daa5ac9e6cb97a23b877e4d2568c85d94 (patch) | |
| tree | 18d84b3a05793588e2306f329874065fc881a0d2 | |
| parent | d831e4c22a0c4e7367f08f0a45c1bae5afca82fd (diff) | |
| download | mariadb-git-6011fb6daa5ac9e6cb97a23b877e4d2568c85d94.tar.gz | |
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.
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 2 | ||||
| -rw-r--r-- | 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 cc69065ff24..effe6626119 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 a6dc9a01407..c675649d40c 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; |