1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merging with mysql-next-mr-bugfixing.

This commit is contained in:
Mats Kindahl
2010-01-25 23:24:24 +01:00
27 changed files with 1230 additions and 281 deletions

View File

@@ -32,6 +32,7 @@
#include "slave.h"
#include <my_bitmap.h>
#include "log_event.h"
#include "sql_audit.h"
#include <m_ctype.h>
#include <sys/stat.h>
#include <thr_alarm.h>
@@ -525,6 +526,7 @@ THD::THD()
dbug_sentry=THD_SENTRY_MAGIC;
#endif
#ifndef EMBEDDED_LIBRARY
mysql_audit_init_thd(this);
net.vio=0;
#endif
client_capabilities= 0; // minimalistic client
@@ -1043,6 +1045,7 @@ THD::~THD()
cleanup();
ha_close_connection(this);
mysql_audit_release(this);
plugin_thdvar_cleanup(this);
DBUG_PRINT("info", ("freeing security context"));
@@ -1060,6 +1063,8 @@ THD::~THD()
delete rli_fake;
rli_fake= NULL;
}
mysql_audit_free_thd(this);
#endif
free_root(&main_mem_root, MYF(0));