Commit 708e0d48 authored by Alexey Kopytov's avatar Alexey Kopytov

Merge from the main tree.

parents 8f407561 b01f5ef1
...@@ -1758,9 +1758,9 @@ void close_connection(THD *thd, uint errcode, bool lock) ...@@ -1758,9 +1758,9 @@ void close_connection(THD *thd, uint errcode, bool lock)
net_send_error(thd, errcode, ER(errcode)); /* purecov: inspected */ net_send_error(thd, errcode, ER(errcode)); /* purecov: inspected */
vio_close(vio); /* vio is freed in delete thd */ vio_close(vio); /* vio is freed in delete thd */
} }
MYSQL_CONNECTION_DONE((int) errcode, thd->thread_id);
if (lock) if (lock)
(void) pthread_mutex_unlock(&LOCK_thread_count); (void) pthread_mutex_unlock(&LOCK_thread_count);
MYSQL_CONNECTION_DONE((int) errcode, thd->thread_id);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#endif /* EMBEDDED_LIBRARY */ #endif /* EMBEDDED_LIBRARY */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment