Automatic merge

1 files changed, 4 insertions, 4 deletions

diff --git a/plugin/handler_socket/handlersocket/database.cpp b/plugin/handler_socket/handlersocket/database.cpp
index f63f011d9b1..311eec55fa8 100644
--- a/plugin/handler_socket/handlersocket/database.cpp
+++ b/plugin/handler_socket/handlersocket/database.cpp
@@ -246,11 +246,11 @@ wait_server_to_start(THD *thd, volatile int& shutdown_flag)
       &abstime);
     pthread_mutex_unlock(&LOCK_server_started);
     pthread_mutex_lock(&thd->mysys_var->mutex);
-    THD::killed_state st = thd->killed;
+    killed_state st = thd->killed;
     pthread_mutex_unlock(&thd->mysys_var->mutex);
     DBG_SHUT(fprintf(stderr, "HNDSOCK wsts kst %d\n", (int)st));
     pthread_mutex_lock(&LOCK_server_started);
-    if (st != THD::NOT_KILLED) {
+    if (st != NOT_KILLED) {
       DBG_SHUT(fprintf(stderr, "HNDSOCK wsts kst %d break\n", (int)st));
       r = -1;
       break;
@@ -357,11 +357,11 @@ bool
 dbcontext::check_alive()
 {
   pthread_mutex_lock(&thd->mysys_var->mutex);
-  THD::killed_state st = thd->killed;
+  killed_state st = thd->killed;
   pthread_mutex_unlock(&thd->mysys_var->mutex);
   DBG_SHUT(fprintf(stderr, "chk HNDSOCK kst %p %p %d %zu\n", thd, &thd->killed,
     (int)st, sizeof(*thd)));
-  if (st != THD::NOT_KILLED) {
+  if (st != NOT_KILLED) {
     DBG_SHUT(fprintf(stderr, "chk HNDSOCK kst %d break\n", (int)st));
     return false;
   }