diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-10-01 10:45:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-10-01 10:45:52 +0400 |
| commit | dc588e3d3fc0d3610ffb6f4e9c804dc539394669 (patch) | |
| tree | ab8dc4c2ca60ca0a795377471fbfea842b21dbe2 /sql/wsrep_thd.cc | |
| parent | f1dcbc2d9a36b00fad4acee447b5c5066725fa7b (diff) | |
| parent | 7e44c455f4de82081af5089e1f77378676aa45ff (diff) | |
| download | mariadb-git-dc588e3d3fc0d3610ffb6f4e9c804dc539394669.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'sql/wsrep_thd.cc')
| -rw-r--r-- | sql/wsrep_thd.cc | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index f5cce69b1d0..9d70875c027 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -87,25 +87,11 @@ static void wsrep_replication_process(THD *thd, static bool create_wsrep_THD(Wsrep_thd_args* args) { ulong old_wsrep_running_threads= wsrep_running_threads; - -#ifdef HAVE_PSI_THREAD_INTERFACE - PSI_thread_key key; - - switch (args->thread_type()) - { - case WSREP_APPLIER_THREAD: - key= key_wsrep_applier; - break; - case WSREP_ROLLBACKER_THREAD: - key= key_wsrep_rollbacker; - break; - default: - assert(0); - key= 0; - break; - } -#endif - bool res= mysql_thread_create(key, args->thread_id(), &connection_attrib, + DBUG_ASSERT(args->thread_type() == WSREP_APPLIER_THREAD || + args->thread_type() == WSREP_ROLLBACKER_THREAD); + bool res= mysql_thread_create(args->thread_type() == WSREP_APPLIER_THREAD + ? key_wsrep_applier : key_wsrep_rollbacker, + args->thread_id(), &connection_attrib, start_wsrep_THD, (void*)args); /* if starting a thread on server startup, wait until the this thread's THD |