summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@sun.com>2010-04-15 13:36:36 +0400
committerSergey Vojtovich <svoj@sun.com>2010-04-15 13:36:36 +0400
commit6b278654a1c6c4bd785b3516c729b2306048ea8e (patch)
tree1d3754e7298cb0a8f2089705931dbc3fbbd3e20a /include
parent471d515ff4bc075cec744801ec868030959497bb (diff)
parent535093e4db2ea85c7278ceaf3867840ad509d7b7 (diff)
downloadmariadb-git-6b278654a1c6c4bd785b3516c729b2306048ea8e.tar.gz
Merge fixes for BUG46587 and BUG47059 to trunk-bugfixing.
Diffstat (limited to 'include')
-rw-r--r--include/mysql/plugin_audit.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h
index 8932767075d..41505da64af 100644
--- a/include/mysql/plugin_audit.h
+++ b/include/mysql/plugin_audit.h
@@ -24,7 +24,7 @@
#define MYSQL_AUDIT_CLASS_MASK_SIZE 1
-#define MYSQL_AUDIT_INTERFACE_VERSION 0x0100
+#define MYSQL_AUDIT_INTERFACE_VERSION 0x0200
/*
The first word in every event class struct indicates the specific
@@ -32,7 +32,7 @@
*/
struct mysql_event
{
- int event_class;
+ unsigned int event_class;
};
@@ -52,7 +52,8 @@ struct mysql_event
struct mysql_event_general
{
- int event_class;
+ unsigned int event_class;
+ unsigned int event_subclass;
int general_error_code;
unsigned long general_thread_id;
const char *general_user;