diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc
index 5c4926c830c..2423fac4ca6 100644
--- a/sql/event_scheduler.cc
+++ b/sql/event_scheduler.cc
@@ -133,12 +133,6 @@ post_init_event_thread(THD *thd)
     thd->cleanup();
     return TRUE;
   }
-
-  thread_safe_increment32(&thread_count, &thread_count_lock);
-  mysql_mutex_lock(&LOCK_thread_count);
-  threads.append(thd);
-  mysql_mutex_unlock(&LOCK_thread_count);
-  inc_thread_running();
   return FALSE;
 }
 
@@ -157,7 +151,13 @@ deinit_event_thread(THD *thd)
   thd->proc_info= "Clearing";
   DBUG_PRINT("exit", ("Event thread finishing"));
 
-  delete_running_thd(thd);
+  mysql_mutex_lock(&LOCK_thread_count);
+  thd->unlink();
+  mysql_mutex_unlock(&LOCK_thread_count);
+
+  delete thd;
+  thread_safe_decrement32(&thread_count, &thread_count_lock);
+  signal_thd_deleted();
 }
 
 
@@ -191,8 +191,10 @@ pre_init_event_thread(THD* thd)
   thd->net.read_timeout= slave_net_timeout;
   thd->variables.option_bits|= OPTION_AUTO_IS_NULL;
   thd->client_capabilities|= CLIENT_MULTI_RESULTS;
+  thread_safe_increment32(&thread_count, &thread_count_lock);
   mysql_mutex_lock(&LOCK_thread_count);
   thd->thread_id= thd->variables.pseudo_thread_id= thread_id++;
+  threads.append(thd);
   mysql_mutex_unlock(&LOCK_thread_count);
 
   /*
@@ -240,13 +242,8 @@ event_scheduler_thread(void *arg)
   my_free(arg);
   if (!res)
     scheduler->run(thd);
-  else
-  {
-    thd->proc_info= "Clearing";
-    net_end(&thd->net);
-    delete thd;
-  }
 
+  deinit_event_thread(thd);
   DBUG_LEAVE;                               // Against gcc warnings
   my_thread_end();
   return 0;
@@ -310,6 +307,7 @@ Event_worker_thread::run(THD *thd, Event_queue_element_for_exec *event)
   DBUG_ENTER("Event_worker_thread::run");
   DBUG_PRINT("info", ("Time is %ld, THD: 0x%lx", (long) my_time(0), (long) thd));
 
+  inc_thread_running();
   if (res)
     goto end;
 
@@ -338,6 +336,7 @@ end:
              event->name.str));
 
   delete event;
+  dec_thread_running();
   deinit_event_thread(thd);
 
   DBUG_VOID_RETURN;
@@ -442,13 +441,9 @@ Event_scheduler::start(int *err_no)
                     " Can not create thread for event scheduler (errno=%d)",
                     *err_no);
 
-    new_thd->proc_info= "Clearing";
-    DBUG_ASSERT(new_thd->net.buff != 0);
-    net_end(&new_thd->net);
-
     state= INITIALIZED;
     scheduler_thd= NULL;
-    delete new_thd;
+    deinit_event_thread(new_thd);
 
     delete scheduler_param_value;
     ret= true;
@@ -515,7 +510,6 @@ Event_scheduler::run(THD *thd)
   }
 
   LOCK_DATA();
-  deinit_event_thread(thd);
   scheduler_thd= NULL;
   state= INITIALIZED;
   DBUG_PRINT("info", ("Broadcasting COND_state back to the stoppers"));
@@ -575,10 +569,7 @@ Event_scheduler::execute_top(Event_queue_element_for_exec *event_name)
     sql_print_error("Event_scheduler::execute_top: Can not create event worker"
                     " thread (errno=%d). Stopping event scheduler", res);
 
-    new_thd->proc_info= "Clearing";
-    DBUG_ASSERT(new_thd->net.buff != 0);
-    net_end(&new_thd->net);
-
+    deinit_event_thread(new_thd);
     goto error;
   }
 
@@ -590,9 +581,6 @@ Event_scheduler::execute_top(Event_queue_element_for_exec *event_name)
 
 error:
   DBUG_PRINT("error", ("Event_scheduler::execute_top() res: %d", res));
-  if (new_thd)
-    delete new_thd;
-
   delete event_name;
   DBUG_RETURN(TRUE);
 }
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5692c88d6c8..63bc83af5d5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2647,23 +2647,6 @@ void dec_connection_count(THD *thd)
 }
 
 
-/*
-  Delete THD and decrement thread counters, including thread_running
-*/
-
-void delete_running_thd(THD *thd)
-{
-  mysql_mutex_lock(&LOCK_thread_count);
-  thd->unlink();
-  mysql_mutex_unlock(&LOCK_thread_count);
-
-  delete thd;
-  dec_thread_running();
-  thread_safe_decrement32(&thread_count, &thread_count_lock);
-  signal_thd_deleted();
-}
-
-
 /*
   Send a signal to unblock close_conneciton() if there is no more
   threads running with a THD attached
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 4538b7c4c70..28ac871d858 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -59,7 +59,6 @@ void kill_mysql(void);
 void close_connection(THD *thd, uint sql_errno= 0);
 void handle_connection_in_main_thread(THD *thd);
 void create_thread_to_handle_connection(THD *thd);
-void delete_running_thd(THD *thd);
 void signal_thd_deleted();
 void unlink_thd(THD *thd);
 bool one_thread_per_connection_end(THD *thd, bool put_in_cache);