From c01bcf473e3cf215e41a77da6acde0f284ab60a8 Mon Sep 17 00:00:00 2001
From: unknown <heikki@hundin.mysql.fi>
Date: Sat, 31 May 2003 03:23:42 +0300
Subject: [PATCH] os0thread.c, os0thread.h, os0sync.h:   Cleanup os0sync.c:  
 Free all OS sync primitives and allocated memory in InnoDB shutdown

innobase/os/os0sync.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown
innobase/include/os0sync.h:
  Cleanup
innobase/include/os0thread.h:
  Cleanup
innobase/os/os0thread.c:
  Cleanup
---
 innobase/include/os0sync.h   | 3 +--
 innobase/include/os0thread.h | 1 -
 innobase/os/os0sync.c        | 3 +--
 innobase/os/os0thread.c      | 1 +
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/innobase/include/os0sync.h b/innobase/include/os0sync.h
index 3096c9256ed..bad8e6e120a 100644
--- a/innobase/include/os0sync.h
+++ b/innobase/include/os0sync.h
@@ -57,8 +57,7 @@ void
 os_sync_init(void);
 /*==============*/
 /*************************************************************
-Frees created events (not in Windows) and OS 'slow' mutexes. OS 'fast'
-mutexes must be freed with sync_free() before this. */
+Frees created events (not in Windows) and OS 'slow' mutexes. */
 
 void
 os_sync_free(void);
diff --git a/innobase/include/os0thread.h b/innobase/include/os0thread.h
index 29154a9e7cf..92187f315c2 100644
--- a/innobase/include/os0thread.h
+++ b/innobase/include/os0thread.h
@@ -11,7 +11,6 @@ Created 9/8/1995 Heikki Tuuri
 #define os0thread_h
 
 #include "univ.i"
-#include "os0sync.h"
 
 /* Maximum number of threads which can be created in the program;
 this is also the size of the wait slot array for MySQL threads which
diff --git a/innobase/os/os0sync.c b/innobase/os/os0sync.c
index ce9f21ec9a1..4f322ee82b2 100644
--- a/innobase/os/os0sync.c
+++ b/innobase/os/os0sync.c
@@ -68,8 +68,7 @@ os_sync_init(void)
 }
 
 /*************************************************************
-Frees created events (not in Windows) and OS 'slow' mutexes. OS 'fast'
-mutexes must be freed with sync_free() before this. */
+Frees created events (not in Windows) and OS 'slow' mutexes. */
 
 void
 os_sync_free(void)
diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c
index 1722051a841..02ea2c227a7 100644
--- a/innobase/os/os0thread.c
+++ b/innobase/os/os0thread.c
@@ -16,6 +16,7 @@ Created 9/8/1995 Heikki Tuuri
 #endif
 
 #include "srv0srv.h"
+#include "os0sync.h"
 
 /*******************************************************************
 Compares two thread ids for equality. */