Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO

Conflicts:
	storage/innobase/os/os0file.cc
	storage/xtradb/os/os0file.cc
	storage/xtradb/srv/srv0start.cc

1 files changed, 3 insertions, 3 deletions

diff --git a/storage/mroonga/lib/mrn_lock.cpp b/storage/mroonga/lib/mrn_lock.cpp
index 94f8a4774af..3340149b237 100644
--- a/storage/mroonga/lib/mrn_lock.cpp
+++ b/storage/mroonga/lib/mrn_lock.cpp
@@ -20,12 +20,12 @@
 #include "mrn_lock.hpp"
 
 namespace mrn {
-  Lock::Lock(pthread_mutex_t *mutex)
+  Lock::Lock(mysql_mutex_t *mutex)
     : mutex_(mutex) {
-    pthread_mutex_lock(mutex_);
+    mysql_mutex_lock(mutex_);
   }
 
   Lock::~Lock() {
-    pthread_mutex_unlock(mutex_);
+    mysql_mutex_unlock(mutex_);
   }
 }