Merge branch 'mysql-8.0' into mysql-trunk

Author: maras007

plugin/x/src/sql_data_context.cc

@@ -120,26 +120,18 @@ ngs::Error_code Sql_data_context::init(const bool is_admin) {
 }
 
 void Sql_data_context::report_error(int error, ...) {
-  if (attach()) return;
-
   va_list args;
   va_start(args, error);
 
   modules::Module_mysqlx::get_instance_services()->m_runtime_error->emit(
       m_authentication_code.error, MYF(0), args);
 
   va_end(args);
-  detach();
 }
 
 void Sql_data_context::deinit() {
   if (m_mysql_session) {
-    srv_session_detach(m_mysql_session);
-
-    log_debug("sqlsession deinit: %p [%i]", m_mysql_session,
-              srv_session_info_get_session_id(m_mysql_session));
-
-    if (m_pre_authenticate_event_fired) {
+    if (m_pre_authenticate_event_fired && !attach()) {
       if (!m_authentication_code) {
         // In case of successfull login, connect event has been generated
         // earlier. Time for generating disconnect event.
@@ -191,6 +183,11 @@ void Sql_data_context::deinit() {
     m_pre_authenticate_event_fired = false;
     m_authentication_code = ngs::Error_code();
 
+    srv_session_detach(m_mysql_session);
+
+    log_debug("sqlsession deinit: %p [%i]", m_mysql_session,
+              srv_session_info_get_session_id(m_mysql_session));
+
     srv_session_close(m_mysql_session);
     m_mysql_session = nullptr;
   }