From 7192d7b700cc624e91518a3200596ae1cd580e70 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svoj@mariadb.org>
Date: Sun, 12 May 2019 02:55:57 +0400
Subject: [PATCH] Simplified away CONNECT::extra_port

Part of MDEV-19515 - Improve connect speed
---
 sql/mysqld.cc      | 3 ---
 sql/sql_class.cc   | 1 -
 sql/sql_class.h    | 1 -
 sql/sql_connect.cc | 1 -
 sql/sql_connect.h  | 2 --
 5 files changed, 8 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f493d3823b2..5aaa9dd0cf8 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6365,10 +6365,7 @@ void handle_accepted_socket(MYSQL_SOCKET new_sock, MYSQL_SOCKET sock)
   }
 
   if (mysql_socket_getfd(sock) == mysql_socket_getfd(extra_ip_sock))
-  {
-    connect->extra_port= 1;
     connect->scheduler= extra_thread_scheduler;
-  }
   create_new_thread(connect);
 }
 
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index b01edf6259b..bd2965efa3e 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -726,7 +726,6 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
   event_scheduler.data= 0;
   event_scheduler.m_psi= 0;
   skip_wait_timeout= false;
-  extra_port= 0;
   catalog= (char*)"std"; // the only catalog we have for now
   main_security_ctx.init();
   security_ctx= &main_security_ctx;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 1266e1777ce..9fc0f9f216c 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3059,7 +3059,6 @@ public:
   uint8      password; /* 0, 1 or 2 */
   uint8      failed_com_change_user;
   bool       slave_thread;
-  bool       extra_port;                        /* If extra connection */
   bool	     no_errors;
 
   /**
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index 2080bdd5c32..68f0461f44c 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -1521,7 +1521,6 @@ THD *CONNECT::create_thd(THD *thd)
                            thd->net.vio->type == VIO_TYPE_SOCKET ?
                            my_localhost : 0;
 
-  thd->extra_port=         extra_port;
   thd->scheduler=          scheduler;
   thd->real_id=            real_id;
   DBUG_RETURN(thd);
diff --git a/sql/sql_connect.h b/sql/sql_connect.h
index d8805350bf2..a46fbdfac60 100644
--- a/sql/sql_connect.h
+++ b/sql/sql_connect.h
@@ -35,7 +35,6 @@ public:
   scheduler_functions *scheduler;
   my_thread_id thread_id;
   pthread_t    real_id;
-  bool extra_port;
 
   /* Own variables */
   bool thread_count_incremented;
@@ -43,7 +42,6 @@ public:
 
   CONNECT()
     :vio(0), scheduler(thread_scheduler), thread_id(0), real_id(0),
-    extra_port(0),
     thread_count_incremented(0), prior_thr_create_utime(0)
   {
   };