summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-05 11:24:10 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-05 11:24:10 +0200
commit935033aea75fd57afc11d842d3d0cd7e1b533353 (patch)
tree6b0cae38d149ea9f0b10fbf68042a4d30b977860
parent4a0612ed2ab95305668a56b1d300526c7b595a29 (diff)
downloadmariadb-git-935033aea75fd57afc11d842d3d0cd7e1b533353.tar.gz
fix wsrep test crashes on startup
-rw-r--r--sql/wsrep_mysqld.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index d76f18a52bb..54fb484bad0 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1762,13 +1762,11 @@ pthread_handler_t start_wsrep_THD(void *arg)
THD *thd;
wsrep_thd_processor_fun processor= (wsrep_thd_processor_fun)arg;
- if (my_thread_init() || (!(thd= new THD(true))))
+ if (my_thread_init() || (!(thd= new THD(next_thread_id(), true))))
{
goto error;
}
- thd->thread_id= next_thread_id();
-
mysql_mutex_lock(&LOCK_thread_count);
if (wsrep_gtid_mode)