summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2016-12-16 18:37:11 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2016-12-16 18:37:11 +0400
commit211cf9321a91b12eaef3d7968adc699085dbb54e (patch)
tree5df15cac1c1bb126e0e789fb3799f98932e56de1 /plugin
parent14e1f32894cdbe63a614738cfd93e9d0818dedee (diff)
downloadmariadb-git-211cf9321a91b12eaef3d7968adc699085dbb54e.tar.gz
MDEV-11510 Audit plugin sometimes causes server to crash when using with MySQL.
MySQL has a bug failing to handle MYSQL_THDVAR_STR(... PLUGIN_VAR_NOSYSVAR | PLUGIN_VAR_NOCMDOPT | PLUGIN_VAR_MEMALLOC) so fall back to just PLUGIN_VAR_READONLY | PLUGIN_VAR_MEMALLOC whem MySQL started.
Diffstat (limited to 'plugin')
-rw-r--r--plugin/server_audit/server_audit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index 95150c82f25..87ba00b2d35 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -2845,6 +2845,7 @@ void __attribute__ ((constructor)) audit_plugin_so_init(void)
_mysql_plugin_declarations_[0].info= mysql_v4_descriptor;
use_event_data_for_disconnect= 1;
}
+ MYSQL_SYSVAR_NAME(loc_info).flags= PLUGIN_VAR_READONLY | PLUGIN_VAR_MEMALLOC;
}
memset(locinfo_ini_value, 'O', sizeof(locinfo_ini_value)-1);