summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAshish Agarwal <ashish.y.agarwal@oracle.com>2013-07-02 11:58:39 +0530
committerAshish Agarwal <ashish.y.agarwal@oracle.com>2013-07-02 11:58:39 +0530
commitf5b5e6b951eabe6d6add84fa915d305a4a95cddf (patch)
treee923a916e758c6cde635765b285649506d0fe00a /include
parent3ee4a82fd1b3f886c027f0144bdce260b721c5a1 (diff)
downloadmariadb-git-f5b5e6b951eabe6d6add84fa915d305a4a95cddf.tar.gz
WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7
Backporting wl6715 to mysql-5.5
Diffstat (limited to 'include')
-rw-r--r--include/mysql/plugin_audit.h6
-rw-r--r--include/mysql/plugin_audit.h.pp4
2 files changed, 9 insertions, 1 deletions
diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h
index eee32a9e523..0d3f9b8d180 100644
--- a/include/mysql/plugin_audit.h
+++ b/include/mysql/plugin_audit.h
@@ -25,7 +25,7 @@
#define MYSQL_AUDIT_CLASS_MASK_SIZE 1
-#define MYSQL_AUDIT_INTERFACE_VERSION 0x0300
+#define MYSQL_AUDIT_INTERFACE_VERSION 0x0301
/*************************************************************************
@@ -59,6 +59,10 @@ struct mysql_event_general
struct charset_info_st *general_charset;
unsigned long long general_time;
unsigned long long general_rows;
+ MYSQL_LEX_STRING general_host;
+ MYSQL_LEX_STRING general_sql_command;
+ MYSQL_LEX_STRING general_external_user;
+ MYSQL_LEX_STRING general_ip;
};
diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp
index 5d90b3efc37..794e2679356 100644
--- a/include/mysql/plugin_audit.h.pp
+++ b/include/mysql/plugin_audit.h.pp
@@ -210,6 +210,10 @@ struct mysql_event_general
struct charset_info_st *general_charset;
unsigned long long general_time;
unsigned long long general_rows;
+ MYSQL_LEX_STRING general_host;
+ MYSQL_LEX_STRING general_sql_command;
+ MYSQL_LEX_STRING general_external_user;
+ MYSQL_LEX_STRING general_ip;
};
struct mysql_event_connection
{