srv0start.c:

  Cleanup

innobase/srv/srv0start.c

@@ -1549,13 +1549,6 @@ innobase_shutdown_for_mysql(void)
 	}
 
 #if defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY)
-	/*
-	  TODO: Fix this temporary solution
-	  We are having a race condition occure with io_handler_thread threads.
-	  When they yield in os_aio_simulated_handle during shutdown, this
-	  thread was able to free the memory early.
-	*/
-	os_thread_yield();
 
 	/* TODO: Where should this be called? */
 	srv_free();
@@ -1563,11 +1556,7 @@ innobase_shutdown_for_mysql(void)
 	/* TODO: Where should this be called? */
 	srv_general_free();
 #endif
-	/*
-	TODO: We should exit the i/o-handler and other utility threads
-	before freeing all memory. Now this can potentially cause a seg
-	fault!
-	*/
+
 #if defined(NOT_WORKING_YET) || defined(__NETWARE__) || defined(SAFE_MUTEX_DETECT_DESTROY)
         /* NetWare requires this free */
         ut_free_all_mem();