Corrected freeing of thd when running with wsrep and thread pool

montywi · montywi · commit 1ab711bebbd9 · 2016-02-07T15:23:08.000+02:00
This is needed because of the new code where THD creation was moved to the new thread
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
@@ -1847,14 +1847,15 @@ pthread_handler_t start_wsrep_THD(void *arg)
     // at server shutdown
   }
 
-  my_thread_end();
   if (thread_handling > SCHEDULER_ONE_THREAD_PER_CONNECTION)
   {
     mysql_mutex_lock(&LOCK_thread_count);
-    delete thd;
-    thread_count--;
+    thd->unlink();
     mysql_mutex_unlock(&LOCK_thread_count);
+    delete thd;
+    dec_thread_count();
   }
+  my_thread_end();
   return(NULL);
 
 error:

Original file line number	Diff line number	Diff line change
`@@ -1847,14 +1847,15 @@ pthread_handler_t start_wsrep_THD(void *arg)`
`1847`	`1847`	`// at server shutdown`
`1848`	`1848`	`}`
`1849`	`1849`
`1850`		`- my_thread_end();`
`1851`	`1850`	`if (thread_handling > SCHEDULER_ONE_THREAD_PER_CONNECTION)`
`1852`	`1851`	`{`
`1853`	`1852`	`mysql_mutex_lock(&LOCK_thread_count);`
`1854`		`- delete thd;`
`1855`		`- thread_count--;`
	`1853`	`+ thd->unlink();`
`1856`	`1854`	`mysql_mutex_unlock(&LOCK_thread_count);`
	`1855`	`+ delete thd;`
	`1856`	`+ dec_thread_count();`
`1857`	`1857`	`}`
	`1858`	`+ my_thread_end();`
`1858`	`1859`	`return(NULL);`
`1859`	`1860`
`1860`	`1861`	`error:`