Merge branch 'mysql-8.0' into mysql-trunk

Change-Id: Ia8239440d583500f67107745d8cb721c722c4112

Author: TharunSai

sql/auth/sha2_password.cc

@@ -936,11 +936,6 @@ static int caching_sha2_password_authenticate(MYSQL_PLUGIN_VIO *vio,
   RSA *public_key = nullptr;
 #endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */
 
-  DBUG_EXECUTE_IF("in_caching_sha2_password_authenticate", {
-    DBUG_SET("+d,wait_until_thread_kill");
-    const char act[] = "now SIGNAL acl_auth_reached";
-    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
-  });
   generate_user_salt(scramble, SCRAMBLE_LENGTH + 1);
 
   /*

sql/auth/sql_authentication.cc

@@ -3833,14 +3833,6 @@ int acl_authenticate(THD *thd, enum_server_command command) {
   static_assert(MYSQL_USERNAME_LENGTH == USERNAME_LENGTH, "");
   assert(command == COM_CONNECT || command == COM_CHANGE_USER);
 
-  mysql_mutex_lock(&thd->LOCK_thd_data);
-
-  DBUG_EXECUTE_IF("before_server_mpvio_initialize", {
-    DBUG_SET("+d,wait_until_thread_kill");
-    const char act[] = "now SIGNAL acl_auth_reached";
-    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
-  });
-
   server_mpvio_initialize(thd, &mpvio, &charset_adapter);
   /*
     Clear thd->db as it points to something, that will be freed when
@@ -3867,7 +3859,6 @@ int acl_authenticate(THD *thd, enum_server_command command) {
                                      mpvio.protocol->get_packet_length())) {
       login_failed_error(thd, &mpvio, mpvio.auth_info.password_used);
       server_mpvio_update_thd(thd, &mpvio);
-      mysql_mutex_unlock(&thd->LOCK_thd_data);
       goto end;
     }
 
@@ -3904,21 +3895,13 @@ int acl_authenticate(THD *thd, enum_server_command command) {
     res = do_multi_factor_auth(thd, &mpvio);
   }
 
-  DBUG_EXECUTE_IF("before_server_mpvio_update_thd", {
-    DBUG_SET("+d,wait_until_thread_kill");
-    const char act[] = "now SIGNAL acl_auth_reached";
-    assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
-  });
-
   server_mpvio_update_thd(thd, &mpvio);
 
   check_and_update_password_lock_state(mpvio, thd, res);
 #ifdef HAVE_PSI_THREAD_INTERFACE
   PSI_THREAD_CALL(set_connection_type)(thd->get_vio_type());
 #endif /* HAVE_PSI_THREAD_INTERFACE */
 
-  mysql_mutex_unlock(&thd->LOCK_thd_data);
-
   {
     Security_context *sctx = thd->security_context();
     const ACL_USER *acl_user = mpvio.acl_user;
@@ -4119,20 +4102,22 @@ int acl_authenticate(THD *thd, enum_server_command command) {
         goto end;
       }
 
-      mysql_mutex_lock(&thd->LOCK_thd_data);
       DBUG_EXECUTE_IF("before_secure_transport_check", {
-        DBUG_SET("+d,wait_until_thread_kill");
-        const char act[] = "now SIGNAL acl_auth_reached";
+        const char act[] = "now SIGNAL kill_now WAIT_FOR killed";
         assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
       });
 
-      if (opt_require_secure_transport && thd->active_vio != nullptr &&
-          !is_secure_transport(thd->active_vio->type)) {
-        mysql_mutex_unlock(&thd->LOCK_thd_data);
+      /*
+        The assumption here is that thd->active_vio and thd->net.vio are both
+        the same at this point. We should not use thd->active_vio at any cost,
+        as a KILL command can shutdown the active_vio i.e., making it a nullptr
+        which would cause issues. Instead we check the net.vio type.
+      */
+      if (opt_require_secure_transport && thd->get_net()->vio != nullptr &&
+          !is_secure_transport(thd->get_net()->vio->type)) {
         my_error(ER_SECURE_TRANSPORT_REQUIRED, MYF(0));
         goto end;
       }
-      mysql_mutex_unlock(&thd->LOCK_thd_data);
 
       /* checking password_time_expire for connecting user */
       password_time_expired = check_password_lifetime(thd, mpvio.acl_user);
@@ -4215,11 +4200,6 @@ int acl_authenticate(THD *thd, enum_server_command command) {
       goto end;
     }
 
-    DBUG_EXECUTE_IF("wait_until_thread_kill", {
-      DBUG_SET("-d,wait_until_thread_kill");
-      const char act[] = "now WAIT_FOR killed";
-      assert(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act)));
-    });
     /*
       This is the default access rights for the current database.  It's
       set to 0 here because we don't have an active database yet (and we

sql/sql_class.h

@@ -1887,6 +1887,8 @@ class THD : public MDL_context_owner,
   NET net;        // client connection descriptor
   String packet;  // dynamic buffer for network I/O
  public:
+  const NET *get_net() const { return &net; }
+
   void set_skip_readonly_check() { skip_readonly_check = true; }
 
   bool is_cmd_skip_readonly() const { return skip_readonly_check; }

sql/sql_parse.cc

@@ -2462,7 +2462,6 @@ bool dispatch_command(THD *thd, const COM_DATA *com_data,
   thd->set_proc_info(nullptr);
   thd->lex->sql_command = SQLCOM_END;
 
-  DEBUG_SYNC(thd, "processlist_wait");
   /* Performance Schema Interface instrumentation, end */
   MYSQL_END_STATEMENT(thd->m_statement_psi, thd->get_stmt_da());
   thd->m_statement_psi = nullptr;
@@ -6395,6 +6394,7 @@ static uint kill_one_thread(THD *thd, my_thread_id id, bool only_kill_query) {
 
   DBUG_TRACE;
   DBUG_PRINT("enter", ("id=%u only_kill=%d", id, only_kill_query));
+  DEBUG_SYNC(thd, "kill_thd_begin");
   THD_ptr tmp = Global_THD_manager::get_instance()->find_thd(&find_thd_with_id);
   Security_context *sctx = thd->security_context();
   if (tmp) {