diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index ab1781edfac..e413b73f62c 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1085,9 +1085,10 @@ void do_handle_bootstrap(THD *thd)
   handle_bootstrap_impl(thd);
 
 end:
-  in_bootstrap= FALSE;
   delete thd;
+
   mysql_mutex_lock(&LOCK_thread_count);
+  in_bootstrap = FALSE;
   mysql_cond_broadcast(&COND_thread_count);
   mysql_mutex_unlock(&LOCK_thread_count);