merge

innobase/include/srv0srv.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innobase.cc:
  Auto merged

1 files changed, 15 insertions, 0 deletions

diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c
index 8da142cd4a6..2cf5160d055 100644
--- a/innobase/os/os0sync.c
+++ b/innobase/os/os0sync.c
@@ -455,6 +455,21 @@ os_fast_mutex_lock(
 }
 
 /**************************************************************
+Releases ownership of a fast mutex. */
+
+void
+os_fast_mutex_unlock(
+/*=================*/
+	os_fast_mutex_t*	fast_mutex)	/* in: mutex to release */
+{
+#ifdef __WIN__
+	LeaveCriticalSection(fast_mutex);
+#else
+	pthread_mutex_unlock(fast_mutex);
+#endif
+}
+
+/**************************************************************
 Frees a mutex object. */
 
 void