os0thread.c, os0thread.h, os0sync.h:

  Cleanup
os0sync.c:
  Free all OS sync primitives and allocated memory in InnoDB shutdown

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);

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

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)

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. */