MDEV-18386: Add server_audit_timestamp_format to customize audit log timestamps

include/mysql/plugin_audit.h.pp

@@ -437,9 +437,11 @@
 extern struct thd_timezone_service_st {
   my_time_t (*thd_TIME_to_gmt_sec)(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
   void (*thd_gmt_sec_to_TIME)(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+  void (*thd_TIME_to_str)(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 } *thd_timezone_service;
 my_time_t thd_TIME_to_gmt_sec(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
 void thd_gmt_sec_to_TIME(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+void thd_TIME_to_str(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 }
 extern "C" {
 typedef enum _thd_wait_type_e {

include/mysql/plugin_auth.h.pp

@@ -437,9 +437,11 @@
 extern struct thd_timezone_service_st {
   my_time_t (*thd_TIME_to_gmt_sec)(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
   void (*thd_gmt_sec_to_TIME)(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+  void (*thd_TIME_to_str)(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 } *thd_timezone_service;
 my_time_t thd_TIME_to_gmt_sec(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
 void thd_gmt_sec_to_TIME(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+void thd_TIME_to_str(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 }
 extern "C" {
 typedef enum _thd_wait_type_e {

include/mysql/plugin_data_type.h.pp

@@ -437,9 +437,11 @@
 extern struct thd_timezone_service_st {
   my_time_t (*thd_TIME_to_gmt_sec)(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
   void (*thd_gmt_sec_to_TIME)(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+  void (*thd_TIME_to_str)(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 } *thd_timezone_service;
 my_time_t thd_TIME_to_gmt_sec(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
 void thd_gmt_sec_to_TIME(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+void thd_TIME_to_str(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 }
 extern "C" {
 typedef enum _thd_wait_type_e {

include/mysql/plugin_encryption.h.pp

@@ -437,9 +437,11 @@
 extern struct thd_timezone_service_st {
   my_time_t (*thd_TIME_to_gmt_sec)(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
   void (*thd_gmt_sec_to_TIME)(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+  void (*thd_TIME_to_str)(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 } *thd_timezone_service;
 my_time_t thd_TIME_to_gmt_sec(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
 void thd_gmt_sec_to_TIME(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+void thd_TIME_to_str(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 }
 extern "C" {
 typedef enum _thd_wait_type_e {

include/mysql/plugin_ftparser.h.pp

@@ -437,9 +437,11 @@
 extern struct thd_timezone_service_st {
   my_time_t (*thd_TIME_to_gmt_sec)(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
   void (*thd_gmt_sec_to_TIME)(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+  void (*thd_TIME_to_str)(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 } *thd_timezone_service;
 my_time_t thd_TIME_to_gmt_sec(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
 void thd_gmt_sec_to_TIME(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+void thd_TIME_to_str(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 }
 extern "C" {
 typedef enum _thd_wait_type_e {

include/mysql/plugin_function.h.pp

@@ -437,9 +437,11 @@
 extern struct thd_timezone_service_st {
   my_time_t (*thd_TIME_to_gmt_sec)(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
   void (*thd_gmt_sec_to_TIME)(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+  void (*thd_TIME_to_str)(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 } *thd_timezone_service;
 my_time_t thd_TIME_to_gmt_sec(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
 void thd_gmt_sec_to_TIME(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+void thd_TIME_to_str(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 }
 extern "C" {
 typedef enum _thd_wait_type_e {

include/mysql/plugin_password_validation.h.pp

@@ -437,9 +437,11 @@
 extern struct thd_timezone_service_st {
   my_time_t (*thd_TIME_to_gmt_sec)(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
   void (*thd_gmt_sec_to_TIME)(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+  void (*thd_TIME_to_str)(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 } *thd_timezone_service;
 my_time_t thd_TIME_to_gmt_sec(THD* thd, const MYSQL_TIME *ltime, unsigned int *errcode);
 void thd_gmt_sec_to_TIME(THD* thd, MYSQL_TIME *ltime, my_time_t t);
+void thd_TIME_to_str(THD* thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 }
 extern "C" {
 typedef enum _thd_wait_type_e {

include/mysql/service_thd_timezone.h

@@ -48,6 +48,7 @@ extern "C" {
 extern struct thd_timezone_service_st {
   my_time_t (*thd_TIME_to_gmt_sec)(MYSQL_THD thd, const MYSQL_TIME *ltime, unsigned int *errcode);
   void (*thd_gmt_sec_to_TIME)(MYSQL_THD thd, MYSQL_TIME *ltime, my_time_t t);
+  void (*thd_TIME_to_str)(MYSQL_THD thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 } *thd_timezone_service;
 
 #ifdef MYSQL_DYNAMIC_PLUGIN
@@ -58,10 +59,14 @@ extern struct thd_timezone_service_st {
 #define thd_gmt_sec_to_TIME(thd, ltime, t) \
   (thd_timezone_service->thd_gmt_sec_to_TIME((thd), (ltime), (t)))
 
+#define thd_TIME_to_str(thd, ltime, format, buf, buf_len) \
+  (thd_timezone_service->thd_TIME_to_str((thd), (ltime), (format), (buf), (buf_len)))
+
 #else
 
 my_time_t thd_TIME_to_gmt_sec(MYSQL_THD thd, const MYSQL_TIME *ltime, unsigned int *errcode);
 void thd_gmt_sec_to_TIME(MYSQL_THD thd, MYSQL_TIME *ltime, my_time_t t);
+void thd_TIME_to_str(MYSQL_THD thd, const MYSQL_TIME *ltime, const char *format, char *buf, unsigned int buf_len);
 
 #endif
 

mysql-test/suite/plugins/r/server_audit.result

@@ -18,6 +18,7 @@ server_audit_syslog_facility	LOG_USER
 server_audit_syslog_ident	mysql-server_auditing
 server_audit_syslog_info	
 server_audit_syslog_priority	LOG_INFO
+server_audit_timestamp_format	%Y%m%d %H:%i:%s
 set global server_audit_file_path=null;
 set global server_audit_incl_users=null;
 set global server_audit_file_path='server_audit.log';
@@ -104,6 +105,7 @@ server_audit_syslog_facility	LOG_USER
 server_audit_syslog_ident	mysql-server_auditing
 server_audit_syslog_info	
 server_audit_syslog_priority	LOG_INFO
+server_audit_timestamp_format	%Y%m%d %H:%i:%s
 set global server_audit_mode=1;
 set global server_audit_events='';
 create database sa_db;
@@ -380,6 +382,7 @@ server_audit_syslog_facility	LOG_USER
 server_audit_syslog_ident	mysql-server_auditing
 server_audit_syslog_info	
 server_audit_syslog_priority	LOG_INFO
+server_audit_timestamp_format	%Y%m%d %H:%i:%s
 uninstall plugin server_audit;
 Warnings:
 Warning	1620	Plugin is busy and will be uninstalled on shutdown

mysql-test/suite/plugins/r/server_audit_buffering.result

@@ -19,6 +19,7 @@ server_audit_syslog_facility	LOG_USER
 server_audit_syslog_ident	mysql-server_auditing
 server_audit_syslog_info	
 server_audit_syslog_priority	LOG_INFO
+server_audit_timestamp_format	%Y%m%d %H:%i:%s
 set global server_audit_logging=on;
 set global server_audit_sync_log_file=on;
 Line count in file: 52

mysql-test/suite/plugins/r/server_audit_query_id.result

@@ -39,31 +39,31 @@ DROP TABLE source, dest, dest_2;
 set global server_audit_logging=off;
 # Wait for audit events to be written
 FOUND 1 /set global server_audit_logging=off/ in server_audit_query_id.log
-TIMESTAMP,HOSTNAME,root,localhost,4,0,QUERY,test,'set global server_audit_logging=on',0
-TIMESTAMP,HOSTNAME,root,localhost,4,1,QUERY,test,'USE test',0
-TIMESTAMP,HOSTNAME,root,localhost,4,2,QUERY,test,'CREATE TABLE source (\nid bigint(20) NOT NULL AUTO_INCREMENT,\nPRIMARY KEY (id)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4',0
-TIMESTAMP,HOSTNAME,root,localhost,4,3,QUERY,test,'CREATE TABLE dest (\nid bigint(20) NOT NULL,\nPRIMARY KEY (id)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4',0
-TIMESTAMP,HOSTNAME,root,localhost,4,4,QUERY,test,'CREATE TABLE dest_2 (\nid bigint(20) NOT NULL,\nPRIMARY KEY (id)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4',0
-TIMESTAMP,HOSTNAME,root,localhost,4,5,QUERY,test,'CREATE TRIGGER test_trigger\nAFTER INSERT ON source\nFOR EACH ROW\nINSERT INTO dest (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,6,QUERY,test,'CREATE TRIGGER test_trigger_2\nAFTER INSERT ON dest\nFOR EACH ROW\nINSERT INTO dest_2 (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,7,QUERY,test,'CREATE PROCEDURE test_procedure (IN id bigint(20))\nNOT DETERMINISTIC MODIFIES SQL DATA\nBEGIN\nINSERT INTO source VALUES (id), (NULL);\nEND',0
-TIMESTAMP,HOSTNAME,root,localhost,4,10,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,9,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,8,QUERY,test,'INSERT INTO source VALUES (NULL)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,13,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,12,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,11,QUERY,test,'INSERT INTO source VALUES (NULL)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,16,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,15,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,18,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,17,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,14,QUERY,test,'INSERT INTO source VALUES (NULL), (NULL)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,22,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,21,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,24,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,23,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,20,QUERY,test,'INSERT INTO source VALUES ( NAME_CONST(\'id\',NULL)), (NULL)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,19,QUERY,test,'CALL test_procedure(NULL)',0
-TIMESTAMP,HOSTNAME,root,localhost,4,25,QUERY,test,'DROP PROCEDURE test_procedure',0
-TIMESTAMP,HOSTNAME,root,localhost,4,26,QUERY,test,'DROP TABLE source, dest, dest_2',0
-TIMESTAMP,HOSTNAME,root,localhost,4,27,QUERY,test,'set global server_audit_logging=off',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_logging=on',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'USE test',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'CREATE TABLE source (\nid bigint(20) NOT NULL AUTO_INCREMENT,\nPRIMARY KEY (id)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'CREATE TABLE dest (\nid bigint(20) NOT NULL,\nPRIMARY KEY (id)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'CREATE TABLE dest_2 (\nid bigint(20) NOT NULL,\nPRIMARY KEY (id)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'CREATE TRIGGER test_trigger\nAFTER INSERT ON source\nFOR EACH ROW\nINSERT INTO dest (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'CREATE TRIGGER test_trigger_2\nAFTER INSERT ON dest\nFOR EACH ROW\nINSERT INTO dest_2 (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'CREATE PROCEDURE test_procedure (IN id bigint(20))\nNOT DETERMINISTIC MODIFIES SQL DATA\nBEGIN\nINSERT INTO source VALUES (id), (NULL);\nEND',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO source VALUES (NULL)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO source VALUES (NULL)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO source VALUES (NULL), (NULL)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest_2 (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO dest (id) VALUES(NEW.id)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'INSERT INTO source VALUES ( NAME_CONST(\'id\',NULL)), (NULL)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'CALL test_procedure(NULL)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'DROP PROCEDURE test_procedure',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'DROP TABLE source, dest, dest_2',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_logging=off',0

mysql-test/suite/plugins/r/server_audit_timestamp.result

@@ -0,0 +1,60 @@
+set global server_audit_logging=on;
+select 1;
+1
+1
+set global server_audit_timestamp_format='CUSTOM-DATE %Y-%m-%d';
+select 2;
+2
+2
+set time_zone='+05:00';
+set global server_audit_timestamp_format='CUSTOM-TZ %H:%i:%s %z';
+select 3;
+3
+3
+set time_zone=DEFAULT;
+set global server_audit_timestamp_format=DEFAULT;
+select 4;
+4
+4
+#
+# Error handling for long timestamp format
+#
+set global server_audit_timestamp_format='%H:%i:%s';
+show variables like 'server_audit_timestamp_format';
+Variable_name	Value
+server_audit_timestamp_format	%H:%i:%s
+# Attempting to set an excessively long format string.
+set global server_audit_timestamp_format='AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+ERROR 42000: Variable 'server_audit_timestamp_format' can't be set to the value of 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+# Value should still be the old one
+show variables like 'server_audit_timestamp_format';
+Variable_name	Value
+server_audit_timestamp_format	%H:%i:%s
+#
+# Test large expansion (many %M specifiers)
+#
+set global server_audit_timestamp_format='%M %M %M %M %M %M %M %M %M %M %M %M %M %M %M';
+select 5;
+5
+5
+set global server_audit_timestamp_format='CMD-LINE-%Y-%m-%d';
+set global server_audit_logging=off;
+CMD-LINE-TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_logging=on',0
+CMD-LINE-TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1',0
+CUSTOM-DATE TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_timestamp_format=\'CUSTOM-DATE %Y-%m-%d\'',0
+CUSTOM-DATE TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 2',0
+CUSTOM-DATE TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set time_zone=\'+05:00\'',0
+CUSTOM-TZ TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_timestamp_format=\'CUSTOM-TZ %H:%i:%s %z\'',0
+CUSTOM-TZ TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 3',0
+CUSTOM-TZ TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set time_zone=DEFAULT',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_timestamp_format=DEFAULT',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 4',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_timestamp_format=\'%H:%i:%s\'',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'show variables like \'server_audit_timestamp_format\'',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select repeat(\'A\', 130)',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_timestamp_format=\'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\'',1231
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'show variables like \'server_audit_timestamp_format\'',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_timestamp_format=\'%M %M %M %M %M %M %M %M %M %M %M %M %M %M %M\'',0
+TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 5',0
+CMD-LINE-TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_timestamp_format=\'CMD-LINE-%Y-%m-%d\'',0
+CMD-LINE-TIMESTAMP,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_logging=off',0

mysql-test/suite/plugins/r/thread_pool_server_audit.result

@@ -18,6 +18,7 @@ server_audit_syslog_facility	LOG_USER
 server_audit_syslog_ident	mysql-server_auditing
 server_audit_syslog_info	
 server_audit_syslog_priority	LOG_INFO
+server_audit_timestamp_format	%Y%m%d %H:%i:%s
 set global server_audit_file_path=null;
 set global server_audit_incl_users=null;
 set global server_audit_file_path='server_audit.log';
@@ -89,6 +90,7 @@ server_audit_syslog_facility	LOG_USER
 server_audit_syslog_ident	mysql-server_auditing
 server_audit_syslog_info	
 server_audit_syslog_priority	LOG_INFO
+server_audit_timestamp_format	%Y%m%d %H:%i:%s
 set global server_audit_mode=1;
 set global server_audit_events='';
 create database sa_db;
@@ -242,6 +244,7 @@ server_audit_syslog_facility	LOG_USER
 server_audit_syslog_ident	mysql-server_auditing
 server_audit_syslog_info	
 server_audit_syslog_priority	LOG_INFO
+server_audit_timestamp_format	%Y%m%d %H:%i:%s
 uninstall plugin server_audit;
 Warnings:
 Warning	1620	Plugin is busy and will be uninstalled on shutdown

mysql-test/suite/plugins/t/server_audit_query_id.test

@@ -83,7 +83,7 @@ set global server_audit_logging=off;
 --exec perl $MYSQL_TEST_DIR/suite/plugins/t/normalize_query_id.pl $SEARCH_FILE
 
 # Output the log without heavy replacements so we can see the actual order
---replace_regex /\d\d\d\d\d\d\d\d \d\d:\d\d:\d\d/TIMESTAMP/ /,[^,]+,root,(localhost|localhost:[0-9]+),/,HOSTNAME,root,localhost,/
+--replace_regex /\d\d\d\d\d\d\d\d \d\d:\d\d:\d\d/TIMESTAMP/ /,[^,]+,root,(localhost|localhost:[0-9]+),\d+,\d+,/,HOSTNAME,root,localhost,ID,ID,/
 
 cat_file $SEARCH_FILE;
 remove_file $SEARCH_FILE;

mysql-test/suite/plugins/t/server_audit_timestamp.opt

@@ -0,0 +1,5 @@
+--plugin-load-add=server_audit
+--server_audit_file_path='server_audit_timestamp.log'
+--server_audit_output_type=file
+--server_audit_events='query'
+--server-audit-timestamp-format=CMD-LINE-%Y-%m-%d