MDEV-259 audit plugin does not see sub-statements

1 files changed, 9 insertions, 6 deletions

diff --git a/sql/sql_audit.h b/sql/sql_audit.h
index 02a63852955..b2ce31f1d26 100644
--- a/sql/sql_audit.h
+++ b/sql/sql_audit.h
@@ -37,8 +37,16 @@ extern void mysql_audit_acquire_plugins(THD *thd, uint event_class);
 #ifndef EMBEDDED_LIBRARY
 extern void mysql_audit_notify(THD *thd, uint event_class,
                                uint event_subtype, ...);
+
+static inline bool mysql_audit_general_enabled()
+{
+  return mysql_global_audit_mask[0] & MYSQL_AUDIT_GENERAL_CLASSMASK;
+}
+
 #else
-#define mysql_audit_notify(...)
+static inline void mysql_audit_notify(THD *thd, uint event_class,
+                                      uint event_subtype, ...) { }
+#define mysql_audit_general_enabled() 0
 #endif
 extern void mysql_audit_release(THD *thd);
 
@@ -53,11 +61,6 @@ static inline uint make_user_name(THD *thd, char *buf)
                   sctx->ip ? sctx->ip : "", "]", NullS) - buf;
 }
 
-static inline bool mysql_audit_general_enabled()
-{
-  return mysql_global_audit_mask[0] & MYSQL_AUDIT_GENERAL_CLASSMASK;
-}
-
 /**
   Call audit plugins of GENERAL audit class, MYSQL_AUDIT_GENERAL_LOG subtype.