From e892e7196997e3c7c385b5e0e714440ff90c0d90 Mon Sep 17 00:00:00 2001
From: Ashish Agarwal <ashish.y.agarwal@oracle.com>
Date: Thu, 17 Jul 2014 19:21:56 +0530
Subject: [PATCH 1/3] WL#7219: Pushing it to release 5.5.39-release branch
---
sql/sql_audit.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc
index bf672b6ea48..6ccdcefe8eb 100644
--- a/sql/sql_audit.cc
+++ b/sql/sql_audit.cc
@@ -353,7 +353,7 @@ int initialize_audit_plugin(st_plugin_int *plugin)
return 1;
}
- if (plugin->plugin->init && plugin->plugin->init(NULL))
+ if (plugin->plugin->init && plugin->plugin->init(plugin))
{
sql_print_error("Plugin '%s' init function returned error.",
plugin->name.str);
From e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 Mon Sep 17 00:00:00 2001
From: Ashish Agarwal <ashish.y.agarwal@oracle.com>
Date: Sat, 19 Jul 2014 11:24:21 +0530
Subject: [PATCH 3/3] WL#7219: Reverting the wl#7219 patch in
mysql-5.5.39-release branch
---
sql/sql_audit.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sql/sql_audit.cc b/sql/sql_audit.cc
index 6ccdcefe8eb..bf672b6ea48 100644
--- a/sql/sql_audit.cc
+++ b/sql/sql_audit.cc
@@ -353,7 +353,7 @@ int initialize_audit_plugin(st_plugin_int *plugin)
return 1;
}
- if (plugin->plugin->init && plugin->plugin->init(plugin))
+ if (plugin->plugin->init && plugin->plugin->init(NULL))
{
sql_print_error("Plugin '%s' init function returned error.",
plugin->name.str);