Merge 10.3 into 10.4

sql/wsrep_thd.cc

@@ -87,9 +87,24 @@ static bool create_wsrep_THD(Wsrep_thd_args* args)
 {
   ulong old_wsrep_running_threads= wsrep_running_threads;
   pthread_t unused;
+#ifdef HAVE_PSI_THREAD_INTERFACE
+  PSI_thread_key key;
 
-  bool res= pthread_create(&unused, &connection_attrib, start_wsrep_THD,
-                           args);
+  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);
+      break;
+  }
+#endif
+  bool res= mysql_thread_create(key, &unused, &connection_attrib,
+                                start_wsrep_THD, (void*)args);
   /*
     if starting a thread on server startup, wait until the this thread's THD
     is fully initialized (otherwise a THD initialization code might