Merge from the main tree.

66241dbe · Alexey Kopytov · 459af24e · 4bfa2f25 · 66241dbe
Commit 66241dbe authored Dec 23, 2008 by Alexey Kopytov
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/mysqld.cc sql/mysqld.cc +1 -1

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1758,9 +1758,9 @@ void close_connection(THD *thd, uint errcode, bool lock)
      net_send_error(thd, errcode, ER(errcode)); /* purecov: inspected */
    vio_close(vio);			/* vio is freed in delete thd */
  }
+  MYSQL_CONNECTION_DONE((int) errcode, thd->thread_id);
  if (lock)
    (void) pthread_mutex_unlock(&LOCK_thread_count);
-  MYSQL_CONNECTION_DONE((int) errcode, thd->thread_id);
  DBUG_VOID_RETURN;
 }
 #endif /* EMBEDDED_LIBRARY */