1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Auto-merge from mysql-next-mr.

This commit is contained in:
Alexander Nozdrin
2010-01-25 19:48:45 +03:00
28 changed files with 1231 additions and 281 deletions

View File

@@ -19,6 +19,7 @@
*/
#include "mysql_priv.h"
#include "sql_audit.h"
#include "probes_mysql.h"
#ifdef HAVE_OPENSSL
@@ -1169,6 +1170,7 @@ void do_handle_one_connection(THD *thd_arg)
while (!net->error && net->vio != 0 &&
!(thd->killed == THD::KILL_CONNECTION))
{
mysql_audit_release(thd);
if (do_command(thd))
break;
}