1 files changed, 10 insertions, 3 deletions
diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c
index ba0ffbda851..ff4c4f021b0 100644
--- a/innobase/srv/srv0start.c
+++ b/innobase/srv/srv0start.c
@@ -1362,8 +1362,15 @@ innobase_shutdown_for_mysql(void)
 		"InnoDB: inside InnoDB at shutdown\n",
 		srv_conc_n_threads);
 	}
-	
-	ut_free_all_mem();
-	
+
+	/*
+	TODO: We should exit the i/o-handler and other utility threads
+	before freeing all memory. Now this can potentially cause a seg
+	fault!
+	*/
+#ifdef NOT_WORKING_YET
+        ut_free_all_mem();
+#endif 
+
 	return((int) DB_SUCCESS);
 }