MDEV-22437 make THR_THD* variable thread_local

Now all access goes through _current_thd() and set_current_thd()
functions.

Some functions like THD::store_globals() can not fail now.

2 files changed, 3 insertions, 4 deletions

diff --git a/plugin/feedback/sender_thread.cc b/plugin/feedback/sender_thread.cc
index 36db4e44cc0..fd9ab65c0fa 100644
--- a/plugin/feedback/sender_thread.cc
+++ b/plugin/feedback/sender_thread.cc
@@ -92,8 +92,7 @@ static int prepare_for_fill(TABLE_LIST *tables)
   thd->variables.pseudo_thread_id= thd->thread_id;
   server_threads.insert(thd);
   thd->thread_stack= (char*) &tables;
-  if (thd->store_globals())
-    return 1;
+  thd->store_globals();
 
   thd->mysys_var->current_cond= &sleep_condition;
   thd->mysys_var->current_mutex= &sleep_mutex;
diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp
index 001981e3baa..91b095cb655 100644
--- a/plugin/handler_socket/handlersocket/database.cpp
+++ b/plugin/handler_socket/handlersocket/database.cpp
@@ -302,7 +302,7 @@ dbcontext::init_thread(const void *stack_bottom, volatile int& shutdown_flag)
       thd->db.length= sizeof("handlersocket")-1;
     }
     thd->variables.option_bits |= OPTION_TABLE_LOCK;
-    my_pthread_setspecific_ptr(THR_THD, thd);
+    set_current_thd(thd);
     DBG_THR(fprintf(stderr, "HNDSOCK x0 %p\n", thd));
   }
   {
@@ -339,7 +339,7 @@ dbcontext::term_thread()
 {
   DBG_THR(fprintf(stderr, "HNDSOCK thread end %p\n", thd));
   close_tables_if();
-  my_pthread_setspecific_ptr(THR_THD, 0);
+  set_current_thd(nullptr);
   {
     delete thd;
     thd = 0;