Merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1320879 into lp:percona-server/5.5

[Sergei Glushchenko]

Bug 1320879: multiple issues when checking audit.log with xmllint
- fixed XML attribute names
- wrapped log by XML tag <audit>
- added XML declaration at the beginning of the file
- expanded test case to verify log with XML parser
- escape not only query text but also other string values
This makes xmllint to stop complaining and also makes
mysqlauditgrep from MySQL tools to work with audit log generated
by PS audit log plugin.
Blueprint
https://blueprints.launchpad.net/percona-server/+spec/audit-log-csv-json
- variable audit_log_format to accept additional options JSON and CSV
- expanded test case to produce JSON and CSV logs and validate them

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/1000/

[Laurynas Biveinis (laurynas-biveinis)]

Wrong target branch?

review: Needs Resubmitting

[Sergei Glushchenko (sergei.glushchenko)]

Yes, it was wrong branch.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'mysql-test/include/audit_log_events.inc'
--- mysql-test/include/audit_log_events.inc	2014-05-14 14:32:33 +0000
+++ mysql-test/include/audit_log_events.inc	2014-05-26 07:58:11 +0000
@@ -2,7 +2,9 @@
 
 CREATE TABLE t1 (c1 INT, c2 CHAR(20));
 --error ER_TABLE_EXISTS_ERROR
-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
+CREATE TABLE t1
+             (c1 INT,
+              c2 CHAR(20));
 INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
 SELECT * FROM t1;
 --error ER_NO_SUCH_TABLE
 
=== modified file 'mysql-test/r/audit_log.result'
--- mysql-test/r/audit_log.result	2014-05-14 14:32:33 +0000
+++ mysql-test/r/audit_log.result	2014-05-26 07:58:11 +0000
@@ -1,146 +1,304 @@
 CREATE TABLE t1 (c1 INT, c2 CHAR(20));
-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
-ERROR 42S01: Table 't1' already exists
-INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
-SELECT * FROM t1;
-c1	c2
-1	a
-2	b
-3	c
-SELECT * FROM t2;
-ERROR 42S02: Table 'test.t2' doesn't exist
-DROP TABLE t1;
-PREPARE stmt1 FROM 'SELECT 1';
-EXECUTE stmt1;
-1
-1
-SHOW STATUS LIKE 'audit_log%';
-Variable_name	Value
-DEALLOCATE PREPARE stmt1;
-show variables like 'audit_log%';
-Variable_name	Value
-audit_log_buffer_size	4096
-audit_log_file	test_audit.log
-audit_log_flush	OFF
-audit_log_format	OLD
-audit_log_policy	ALL
-audit_log_rotate_on_size	0
-audit_log_rotations	0
-audit_log_strategy	ASYNCHRONOUS
-connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
-ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
-create table t1 (id int);
-create table t2 (id int);
-insert into t1 values (1), (2);
-insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
-select * from t1;
-id
-1
-2
-alter table t1 rename renamed_t1;
-select * from t_doesnt_exist;
-ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
-syntax_error_query;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
-drop table renamed_t1, t2;
-show variables like 'audit_log%';
-Variable_name	Value
-audit_log_buffer_size	4096
-audit_log_file	test_audit.log
-audit_log_flush	OFF
-audit_log_format	OLD
-audit_log_policy	ALL
-audit_log_rotate_on_size	0
-audit_log_rotations	0
-audit_log_strategy	ASYNCHRONOUS
-create database sa_db;
-create table t1 (id2 int);
-insert into t1 values (1), (2);
-select * from t1;
-id2
-1
-2
-drop table t1;
-use sa_db;
-create table sa_t1(id int);
-insert into sa_t1 values (1), (2);
-drop table sa_t1;
-drop database sa_db;
-create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
-drop user 'jeffrey'@'localhost';
-select '&;&&&""""<><<>>>>';
-&;&&&""""<><<>>>>
-&;&&&""""<><<>>>>
-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
-ERROR 42S01: Table 't1' already exists
-INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
-SELECT * FROM t1;
-c1	c2
-1	a
-2	b
-3	c
-SELECT * FROM t2;
-ERROR 42S02: Table 'test.t2' doesn't exist
-DROP TABLE t1;
-PREPARE stmt1 FROM 'SELECT 1';
-EXECUTE stmt1;
-1
-1
-SHOW STATUS LIKE 'audit_log%';
-Variable_name	Value
-DEALLOCATE PREPARE stmt1;
-show variables like 'audit_log%';
-Variable_name	Value
-audit_log_buffer_size	4096
-audit_log_file	test_audit.log
-audit_log_flush	OFF
-audit_log_format	NEW
-audit_log_policy	LOGINS
-audit_log_rotate_on_size	0
-audit_log_rotations	0
-audit_log_strategy	SYNCHRONOUS
-connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
-ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
-create table t1 (id int);
-create table t2 (id int);
-insert into t1 values (1), (2);
-insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
-select * from t1;
-id
-1
-2
-alter table t1 rename renamed_t1;
-select * from t_doesnt_exist;
-ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
-syntax_error_query;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
-drop table renamed_t1, t2;
-show variables like 'audit_log%';
-Variable_name	Value
-audit_log_buffer_size	4096
-audit_log_file	test_audit.log
-audit_log_flush	OFF
-audit_log_format	NEW
-audit_log_policy	LOGINS
-audit_log_rotate_on_size	0
-audit_log_rotations	0
-audit_log_strategy	SYNCHRONOUS
-create database sa_db;
-create table t1 (id2 int);
-insert into t1 values (1), (2);
-select * from t1;
-id2
-1
-2
-drop table t1;
-use sa_db;
-create table sa_t1(id int);
-insert into sa_t1 values (1), (2);
-drop table sa_t1;
-drop database sa_db;
-create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
-drop user 'jeffrey'@'localhost';
-select '&;&&&""""<><<>>>>';
-&;&&&""""<><<>>>>
-&;&&&""""<><<>>>>
+CREATE TABLE t1
+(c1 INT,
+c2 CHAR(20));
+ERROR 42S01: Table 't1' already exists
+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
+SELECT * FROM t1;
+c1	c2
+1	a
+2	b
+3	c
+SELECT * FROM t2;
+ERROR 42S02: Table 'test.t2' doesn't exist
+DROP TABLE t1;
+PREPARE stmt1 FROM 'SELECT 1';
+EXECUTE stmt1;
+1
+1
+SHOW STATUS LIKE 'audit_log%';
+Variable_name	Value
+DEALLOCATE PREPARE stmt1;
+show variables like 'audit_log%';
+Variable_name	Value
+audit_log_buffer_size	4096
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	OLD
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	ASYNCHRONOUS
+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
+create table t1 (id int);
+create table t2 (id int);
+insert into t1 values (1), (2);
+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
+select * from t1;
+id
+1
+2
+alter table t1 rename renamed_t1;
+select * from t_doesnt_exist;
+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
+syntax_error_query;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
+drop table renamed_t1, t2;
+show variables like 'audit_log%';
+Variable_name	Value
+audit_log_buffer_size	4096
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	OLD
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	ASYNCHRONOUS
+create database sa_db;
+create table t1 (id2 int);
+insert into t1 values (1), (2);
+select * from t1;
+id2
+1
+2
+drop table t1;
+use sa_db;
+create table sa_t1(id int);
+insert into sa_t1 values (1), (2);
+drop table sa_t1;
+drop database sa_db;
+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
+drop user 'jeffrey'@'localhost';
+select '&;&&&""""<><<>>>>';
+&;&&&""""<><<>>>>
+&;&&&""""<><<>>>>
+set global audit_log_flush= ON;
+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
+CREATE TABLE t1
+(c1 INT,
+c2 CHAR(20));
+ERROR 42S01: Table 't1' already exists
+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
+SELECT * FROM t1;
+c1	c2
+1	a
+2	b
+3	c
+SELECT * FROM t2;
+ERROR 42S02: Table 'test.t2' doesn't exist
+DROP TABLE t1;
+PREPARE stmt1 FROM 'SELECT 1';
+EXECUTE stmt1;
+1
+1
+SHOW STATUS LIKE 'audit_log%';
+Variable_name	Value
+DEALLOCATE PREPARE stmt1;
+show variables like 'audit_log%';
+Variable_name	Value
+audit_log_buffer_size	4096
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	NEW
+audit_log_policy	LOGINS
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
+create table t1 (id int);
+create table t2 (id int);
+insert into t1 values (1), (2);
+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
+select * from t1;
+id
+1
+2
+alter table t1 rename renamed_t1;
+select * from t_doesnt_exist;
+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
+syntax_error_query;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
+drop table renamed_t1, t2;
+show variables like 'audit_log%';
+Variable_name	Value
+audit_log_buffer_size	4096
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	NEW
+audit_log_policy	LOGINS
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+create database sa_db;
+create table t1 (id2 int);
+insert into t1 values (1), (2);
+select * from t1;
+id2
+1
+2
+drop table t1;
+use sa_db;
+create table sa_t1(id int);
+insert into sa_t1 values (1), (2);
+drop table sa_t1;
+drop database sa_db;
+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
+drop user 'jeffrey'@'localhost';
+select '&;&&&""""<><<>>>>';
+&;&&&""""<><<>>>>
+&;&&&""""<><<>>>>
+set global audit_log_flush= ON;
+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
+CREATE TABLE t1
+(c1 INT,
+c2 CHAR(20));
+ERROR 42S01: Table 't1' already exists
+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
+SELECT * FROM t1;
+c1	c2
+1	a
+2	b
+3	c
+SELECT * FROM t2;
+ERROR 42S02: Table 'test.t2' doesn't exist
+DROP TABLE t1;
+PREPARE stmt1 FROM 'SELECT 1';
+EXECUTE stmt1;
+1
+1
+SHOW STATUS LIKE 'audit_log%';
+Variable_name	Value
+DEALLOCATE PREPARE stmt1;
+show variables like 'audit_log%';
+Variable_name	Value
+audit_log_buffer_size	4096
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	JSON
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
+create table t1 (id int);
+create table t2 (id int);
+insert into t1 values (1), (2);
+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
+select * from t1;
+id
+1
+2
+alter table t1 rename renamed_t1;
+select * from t_doesnt_exist;
+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
+syntax_error_query;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
+drop table renamed_t1, t2;
+show variables like 'audit_log%';
+Variable_name	Value
+audit_log_buffer_size	4096
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	JSON
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+create database sa_db;
+create table t1 (id2 int);
+insert into t1 values (1), (2);
+select * from t1;
+id2
+1
+2
+drop table t1;
+use sa_db;
+create table sa_t1(id int);
+insert into sa_t1 values (1), (2);
+drop table sa_t1;
+drop database sa_db;
+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
+drop user 'jeffrey'@'localhost';
+select '&;&&&""""<><<>>>>';
+&;&&&""""<><<>>>>
+&;&&&""""<><<>>>>
+set global audit_log_flush= ON;
+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
+CREATE TABLE t1
+(c1 INT,
+c2 CHAR(20));
+ERROR 42S01: Table 't1' already exists
+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
+SELECT * FROM t1;
+c1	c2
+1	a
+2	b
+3	c
+SELECT * FROM t2;
+ERROR 42S02: Table 'test.t2' doesn't exist
+DROP TABLE t1;
+PREPARE stmt1 FROM 'SELECT 1';
+EXECUTE stmt1;
+1
+1
+SHOW STATUS LIKE 'audit_log%';
+Variable_name	Value
+DEALLOCATE PREPARE stmt1;
+show variables like 'audit_log%';
+Variable_name	Value
+audit_log_buffer_size	4096
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	CSV
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
+create table t1 (id int);
+create table t2 (id int);
+insert into t1 values (1), (2);
+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
+select * from t1;
+id
+1
+2
+alter table t1 rename renamed_t1;
+select * from t_doesnt_exist;
+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
+syntax_error_query;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
+drop table renamed_t1, t2;
+show variables like 'audit_log%';
+Variable_name	Value
+audit_log_buffer_size	4096
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	CSV
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+create database sa_db;
+create table t1 (id2 int);
+insert into t1 values (1), (2);
+select * from t1;
+id2
+1
+2
+drop table t1;
+use sa_db;
+create table sa_t1(id int);
+insert into sa_t1 values (1), (2);
+drop table sa_t1;
+drop database sa_db;
+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
+drop user 'jeffrey'@'localhost';
+select '&;&&&""""<><<>>>>';
+&;&&&""""<><<>>>>
+&;&&&""""<><<>>>>
+set global audit_log_flush= ON;
 
=== modified file 'mysql-test/t/audit_log.test'
--- mysql-test/t/audit_log.test	2014-04-21 12:07:45 +0000
+++ mysql-test/t/audit_log.test	2014-05-26 07:58:11 +0000
@@ -1,23 +1,77 @@
 --source include/not_embedded.inc
 
-# Adjustment to the OS dependent extension of shared libraries.
-let $expected_extension= so;
-if(`SELECT CONVERT(@@version_compile_os USING latin1)
-           IN ("Win32","Win64","Windows")`)
-{
-   let $expected_extension= dll;
-}
-
-let $MYSQL_DATA_DIR= `select @@datadir`;
-
---source include/audit_log_events.inc
-
---exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---shutdown_server
---source include/wait_until_disconnected.inc
---enable_reconnect
---exec echo "restart: --audit_log_policy=LOGINS --audit-log-format=NEW --audit_log_strategy=SYNCHRONOUS" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
---source include/wait_until_connected_again.inc
-
---source include/audit_log_events.inc
-
+let $MYSQLD_DATADIR= `select @@datadir`;
+let MYSQLD_DATADIR= $MYSQLD_DATADIR;
+
+--source include/audit_log_events.inc
+
+--move_file $MYSQLD_DATADIR/test_audit.log $MYSQLD_DATADIR/test_audit_old.log
+set global audit_log_flush= ON;
+perl;
+  eval "use XML::Parser; 1" or exit 0;
+  $p = new XML::Parser;
+  $p->parsefile($ENV{'MYSQLD_DATADIR'} . '/test_audit_old.log');
+EOF
+--remove_file $MYSQLD_DATADIR/test_audit.log
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart: --audit_log_policy=LOGINS --audit-log-format=NEW --audit_log_strategy=SEMISYNCHRONOUS" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+--source include/audit_log_events.inc
+
+--move_file $MYSQLD_DATADIR/test_audit.log $MYSQLD_DATADIR/test_audit_new.log
+set global audit_log_flush= ON;
+perl;
+  eval "use XML::Parser; 1" or exit 0;
+  $p = new XML::Parser;
+  $p->parsefile($ENV{'MYSQLD_DATADIR'} . '/test_audit_new.log');
+EOF
+--remove_file $MYSQLD_DATADIR/test_audit.log
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart: --audit-log-format=JSON --audit_log_strategy=SEMISYNCHRONOUS" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+--source include/audit_log_events.inc
+
+--move_file $MYSQLD_DATADIR/test_audit.log $MYSQLD_DATADIR/test_audit_json.log
+set global audit_log_flush= ON;
+perl;
+  eval "use JSON qw(decode_json); 1" or exit 0;
+  open my $file, $ENV{'MYSQLD_DATADIR'} . '/test_audit_json.log' or die "Could not open log: $!";
+  while (my $line = <$file>) {
+      decode_json($line);
+  }
+  close $file;
+EOF
+--remove_file $MYSQLD_DATADIR/test_audit.log
+
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--exec echo "restart: --audit-log-format=CSV --audit_log_strategy=SEMISYNCHRONOUS" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+--source include/audit_log_events.inc
+
+--move_file $MYSQLD_DATADIR/test_audit.log $MYSQLD_DATADIR/test_audit_csv.log
+set global audit_log_flush= ON;
+perl;
+  eval "use Text::CSV; 1" or exit 0;
+  my $p = Text::CSV->new({ binary => 1, auto_diag => 1, sep_char => ',' });
+  open my $file, $ENV{'MYSQLD_DATADIR'} . '/test_audit_csv.log' or die "Could not open log: $!";
+  while ($p->getline($file)) {};
+  if (not $p->eof) {
+    die "CSV parse error " . $p->error_diag();
+  }
+  close $file;
+EOF
+--remove_file $MYSQLD_DATADIR/test_audit.log
 
=== modified file 'plugin/audit_log/audit_log.c'
--- plugin/audit_log/audit_log.c	2014-05-14 14:32:33 +0000
+++ plugin/audit_log/audit_log.c	2014-05-26 07:58:11 +0000
@@ -35,7 +35,9 @@
 enum audit_log_policy_t { ALL, NONE, LOGINS, QUERIES };
 enum audit_log_strategy_t
   { ASYNCHRONOUS, PERFORMANCE, SEMISYNCHRONOUS, SYNCHRONOUS };
-enum audit_log_format_t { OLD, NEW };
+enum audit_log_format_t { OLD, NEW, JSON, CSV };
+
+typedef void (*escape_buf_func_t)(const char *, size_t *, char *, size_t *);
 
 static LOGGER_HANDLE *audit_file_logger= NULL;
 static audit_log_buffer_t *audit_log_buffer= NULL;
@@ -113,41 +115,37 @@
   return buf;
 }
 
+typedef struct
+{
+  char character;
+  size_t length;
+  const char *replacement;
+} escape_rule_t;
+
 static
-void xml_escape(const char *in, size_t *inlen, char* out, size_t *outlen)
+void escape_buf(const char *in, size_t *inlen, char *out, size_t *outlen,
+                const escape_rule_t *escape_rules)
 {
   char* outstart = out;
   const char* base = in;
   char* outend = out + *outlen;
   const char* inend;
-  size_t i;
+  const escape_rule_t *rule;
   my_bool replaced;
 
-  const struct {
-    char symbol;
-    size_t length;
-    const char *replace;
-  } escape[] = {
-    { '<',  4, "&lt;" },
-    { '>',  4, "&gt;" },
-    { '&',  5, "&amp;" },
-    { '\r', 5, "&#13;" },
-    { '"',  6, "&quot;" },
-  };
-
   inend = in + (*inlen);
 
   while ((in < inend) && (out < outend))
   {
     replaced= FALSE;
-    for (i= 0; i < array_elements(escape); i++)
+    for (rule= escape_rules; rule->character; rule++)
     {
-      if (*in == escape[i].symbol)
+      if (*in == rule->character)
       {
-        if ((outend - out) < (int) escape[i].length)
+        if ((outend - out) < (int) rule->length)
           goto end_of_buffer;
-        memcpy(out, escape[i].replace, escape[i].length);
-        out += escape[i].length;
+        memcpy(out, rule->replacement, rule->length);
+        out += rule->length;
         replaced= TRUE;
         break;
       }
@@ -161,20 +159,71 @@
   *inlen = in - base;
 }
 
-
-static
-char *xml_escape_string(const char *in, size_t inlen,
-                        char *out, size_t outlen)
-{
+static
+void xml_escape(const char *in, size_t *inlen, char *out, size_t *outlen)
+{
+  const escape_rule_t rules[]=
+  {
+    { '<',  4, "&lt;" },
+    { '>',  4, "&gt;" },
+    { '&',  5, "&amp;" },
+    { '\r', 5, "&#13;" },
+    { '\n', 5, "&#10;" },
+    { '"',  6, "&quot;" },
+    { 0,  0, NULL }
+  };
+
+  escape_buf(in, inlen, out, outlen, rules);
+}
+
+static
+void json_escape(const char *in, size_t *inlen, char *out, size_t *outlen)
+{
+  const escape_rule_t rules[]=
+  {
+    { '\\', 2, "\\\\" },
+    { '"',  2, "\\\"" },
+    { '\r',  2, "\\r" },
+    { '\n',  2, "\\n" },
+    { 0,  0, NULL }
+  };
+
+  escape_buf(in, inlen, out, outlen, rules);
+}
+
+static
+void csv_escape(const char *in, size_t *inlen, char *out, size_t *outlen)
+{
+  const escape_rule_t rules[]=
+  {
+    { '"',  2, "\"\"" },
+    { 0,  0, NULL }
+  };
+
+  escape_buf(in, inlen, out, outlen, rules);
+}
+
+static
+char *escape_string(const char *in, size_t inlen,
+                    char *out, size_t outlen,
+                    char **endptr)
+{
+  const escape_buf_func_t format_escape_func[]=
+        { xml_escape, xml_escape, json_escape, csv_escape };
+
   if (in != NULL)
   {
     --outlen;
-    xml_escape(in, &inlen, out, &outlen);
+    format_escape_func[audit_log_format](in, &inlen, out, &outlen);
     out[outlen]= 0;
+    if (endptr)
+      *endptr= out + outlen + 1;
   }
   else
   {
-    out= 0;
+    *out= 0;
+    if (endptr)
+      *endptr= out + 1;
   }
   return out;
 }
@@ -273,13 +322,14 @@
   char arg_buf[512];
   const char *format_string[] = {
                      "<AUDIT_RECORD\n"
-                     "  \"NAME\"=\"%s\"\n"
-                     "  \"RECORD\"=\"%s\"\n"
-                     "  \"TIMESTAMP\"=\"%s\"\n"
-                     "  \"MYSQL_VERSION\"=\"%s\"\n"
-                     "  \"STARTUP_OPTIONS\"=\"%s\"\n"
-                     "  \"OS_VERSION\"=\""MACHINE_TYPE"-"SYSTEM_TYPE"\",\n"
+                     "  NAME=\"%s\"\n"
+                     "  RECORD=\"%s\"\n"
+                     "  TIMESTAMP=\"%s\"\n"
+                     "  MYSQL_VERSION=\"%s\"\n"
+                     "  STARTUP_OPTIONS=\"%s\"\n"
+                     "  OS_VERSION=\""MACHINE_TYPE"-"SYSTEM_TYPE"\"\n"
                      "/>\n",
+
                      "<AUDIT_RECORD>\n"
                      "  <NAME>%s</NAME>\n"
                      "  <RECORD>%s</RECORD>\n"
@@ -287,7 +337,15 @@
                      "  <MYSQL_VERSION>%s</MYSQL_VERSION>\n"
                      "  <STARTUP_OPTIONS>%s</STARTUP_OPTIONS>\n"
                      "  <OS_VERSION>"MACHINE_TYPE"-"SYSTEM_TYPE"</OS_VERSION>\n"
-                     "</AUDIT_RECORD>\n" };
+                     "</AUDIT_RECORD>\n",
+
+                     "{\"audit_record\":{\"name\":\"%s\",\"record\":\"%s\","
+                     "\"timestamp\":\"%s\",\"mysql_version\":\"%s\","
+                     "\"startup_optionsi\":\"%s\","
+                     "\"os_version\":\""MACHINE_TYPE"-"SYSTEM_TYPE"\"}}\n",
+
+                     "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\","
+                     "\""MACHINE_TYPE"-"SYSTEM_TYPE"\"\n" };
 
   return my_snprintf(buf, buflen,
                      format_string[audit_log_format],
@@ -307,21 +365,23 @@
 {
   char id_str[MAX_RECORD_ID_SIZE];
   char timestamp[MAX_TIMESTAMP_SIZE];
-  char query[512];
+  char query[512], tmp[128];
+  char *endptr= tmp, *endtmp= tmp + sizeof(tmp);
   const char *format_string[] = {
                      "<AUDIT_RECORD\n"
-                     "  \"NAME\"=\"%s\"\n"
-                     "  \"RECORD\"=\"%s\"\n"
-                     "  \"TIMESTAMP\"=\"%s\"\n"
-                     "  \"COMMAND_CLASS\"=\"%s\"\n"
-                     "  \"CONNECTION_ID\"=\"%lu\"\n"
-                     "  \"STATUS\"=\"%d\"\n"
-                     "  \"SQLTEXT\"=\"%s\"\n"
-                     "  \"USER\"=\"%s\"\n"
-                     "  \"HOST\"=\"%s\"\n"
-                     "  \"OS_USER\"=\"%s\"\n"
-                     "  \"IP\"=\"%s\"\n"
+                     "  NAME=\"%s\"\n"
+                     "  RECORD=\"%s\"\n"
+                     "  TIMESTAMP=\"%s\"\n"
+                     "  COMMAND_CLASS=\"%s\"\n"
+                     "  CONNECTION_ID=\"%lu\"\n"
+                     "  STATUS=\"%d\"\n"
+                     "  SQLTEXT=\"%s\"\n"
+                     "  USER=\"%s\"\n"
+                     "  HOST=\"%s\"\n"
+                     "  OS_USER=\"%s\"\n"
+                     "  IP=\"%s\"\n"
                      "/>\n",
+
                      "<AUDIT_RECORD>\n"
                      "  <NAME>%s</NAME>\n"
                      "  <RECORD>%s</RECORD>\n"
@@ -334,7 +394,23 @@
                      "  <HOST>%s</HOST>\n"
                      "  <OS_USER>%s</OS_USER>\n"
                      "  <IP>%s</IP>\n"
-                     "</AUDIT_RECORD>\n" };
+                     "</AUDIT_RECORD>\n",
+
+                     "{\"audit_record\":"
+                       "{\"name\":\"%s\","
+                       "\"record\":\"%s\","
+                       "\"timestamp\":\"%s\","
+                       "\"command_class\":\"%s\","
+                       "\"connection_id\":\"%lu\","
+                       "\"status\":%d,"
+                       "\"sqltext\":\"%s\","
+                       "\"user\":\"%s\","
+                       "\"host\":\"%s\","
+                       "\"os_user\":\"%s\","
+                       "\"ip\":\"%s\"}}\n",
+
+                     "\"%s\",\"%s\",\"%s\",\"%s\",\"%lu\",%d,\"%s\",\"%s\","
+                     "\"%s\",\"%s\",\"%s\"\n" };
 
   return my_snprintf(buf, buflen,
                      format_string[audit_log_format],
@@ -343,13 +419,21 @@
                      make_timestamp(timestamp, sizeof(timestamp), t),
                      event->general_sql_command.str,
                      event->general_thread_id, status,
-                     xml_escape_string(event->general_query,
-                                       event->general_query_length,
-                                       query, sizeof(query)),
-                     event->general_user,
-                     event->general_host.str,
-                     event->general_external_user.str,
-                     event->general_ip.str);
+                     escape_string(event->general_query,
+                                   event->general_query_length,
+                                   query, sizeof(query), NULL),
+                     escape_string(event->general_user,
+                                   event->general_user_length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->general_host.str,
+                                   event->general_host.length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->general_external_user.str,
+                                   event->general_external_user.length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->general_ip.str,
+                                   event->general_ip.length,
+                                   endptr, endtmp - endptr, &endptr));
 }
 
 static
@@ -359,21 +443,24 @@
 {
   char id_str[MAX_RECORD_ID_SIZE];
   char timestamp[MAX_TIMESTAMP_SIZE];
+  char tmp[128];
+  char *endptr= tmp, *endtmp= tmp + sizeof(tmp);
   const char *format_string[] = {
                      "<AUDIT_RECORD\n"
-                     "  \"NAME\"=\"%s\"\n"
-                     "  \"RECORD\"=\"%s\"\n"
-                     "  \"TIMESTAMP\"=\"%s\"\n"
-                     "  \"CONNECTION_ID\"=\"%lu\"\n"
-                     "  \"STATUS\"=\"%d\"\n"
-                     "  \"USER\"=\"%s\"\n"
-                     "  \"PRIV_USER\"=\"%s\"\n"
-                     "  \"OS_LOGIN\"=\"%s\"\n"
-                     "  \"PROXY_USER\"=\"%s\"\n"
-                     "  \"HOST\"=\"%s\"\n"
-                     "  \"IP\"=\"%s\"\n"
-                     "  \"DB\"=\"%s\"\n"
+                     "  NAME=\"%s\"\n"
+                     "  RECORD=\"%s\"\n"
+                     "  TIMESTAMP=\"%s\"\n"
+                     "  CONNECTION_ID=\"%lu\"\n"
+                     "  STATUS=\"%d\"\n"
+                     "  USER=\"%s\"\n"
+                     "  PRIV_USER=\"%s\"\n"
+                     "  OS_LOGIN=\"%s\"\n"
+                     "  PROXY_USER=\"%s\"\n"
+                     "  HOST=\"%s\"\n"
+                     "  IP=\"%s\"\n"
+                     "  DB=\"%s\"\n"
                      "/>\n",
+
                      "<AUDIT_RECORD>\n"
                      "  <NAME>%s</NAME>\n"
                      "  <RECORD>%s</RECORD>\n"
@@ -387,34 +474,96 @@
                      "  <HOST>%s</HOST>\n"
                      "  <IP>%s</IP>\n"
                      "  <DB>%s</DB>\n"
-                     "</AUDIT_RECORD>\n" };
+                     "</AUDIT_RECORD>\n",
+
+                     "{\"audit_record\":"
+                       "{\"name\":\"%s\","
+                       "\"record\":\"%s\","
+                       "\"timestamp\":\"%s\","
+                       "\"connection_id\":\"%lu\","
+                       "\"status\":%d,"
+                       "\"user\":\"%s\","
+                       "\"priv_user\":\"%s\","
+                       "\"os_login\":\"%s\","
+                       "\"proxy_user\":\"%s\","
+                       "\"host\":\"%s\","
+                       "\"ip\":\"%s\","
+                       "\"db\":\"%s\"}}\n",
+
+                     "\"%s\",\"%s\",\"%s\",\"%lu\",%d,\"%s\",\"%s\",\"%s\","
+                     "\"%s\",\"%s\",\"%s\",\"%s\"\n" };
 
   return my_snprintf(buf, buflen,
                      format_string[audit_log_format],
-                      name,
-                      make_record_id(id_str, sizeof(id_str)),
-                      make_timestamp(timestamp, sizeof(timestamp), t),
-                      event->thread_id,
-                      event->status,
-                      event->user ? event->user : "",
-                      event->priv_user ? event->priv_user : "",
-                      event->external_user ? event->external_user : "",
-                      event->proxy_user ? event->proxy_user : "",
-                      event->host ? event->host : "",
-                      event->ip ? event->ip : "",
-                      event->database ? event->database : "");
-}
-
+                     name,
+                     make_record_id(id_str, sizeof(id_str)),
+                     make_timestamp(timestamp, sizeof(timestamp), t),
+                     event->thread_id,
+                     event->status,
+                     escape_string(event->user,
+                                   event->user_length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->priv_user,
+                                   event->priv_user_length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->external_user,
+                                   event->external_user_length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->proxy_user,
+                                   event->proxy_user_length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->host,
+                                   event->host_length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->user,
+                                   event->user_length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->ip,
+                                   event->ip_length,
+                                   endptr, endtmp - endptr, &endptr),
+                     escape_string(event->database,
+                                   event->database_length,
+                                   endptr, endtmp - endptr, &endptr));
+}
+
+static
+size_t audit_log_header(MY_STAT *stat, char *buf, size_t buflen)
+{
+  const char *format_string[] = {
+                     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                     "<AUDIT>\n",
+                     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+                     "<AUDIT>\n",
+                     "",
+                     "" };
+
+  log_file_time= stat->st_mtime;
+
+  init_record_id(stat->st_size);
+
+  return my_snprintf(buf, buflen, format_string[audit_log_format]);
+}
+
+
+static
+size_t audit_log_footer(char *buf, size_t buflen)
+{
+  const char *format_string[] = {
+                     "</AUDIT>\n",
+                     "</AUDIT>\n",
+                     "",
+                     "" };
+
+  return my_snprintf(buf, buflen, format_string[audit_log_format]);
+}
 
 static
 int init_new_log_file()
 {
-  MY_STAT stat_arg;
-
   audit_file_logger= logger_open(audit_log_file, audit_log_rotate_on_size,
                             audit_log_rotate_on_size ? audit_log_rotations : 0,
                             audit_log_strategy >= SEMISYNCHRONOUS,
-                            &stat_arg);
+                            audit_log_header);
   if (audit_file_logger == NULL)
   {
     fprintf_timestamp(stderr);
@@ -423,10 +572,6 @@
     return(1);
   }
 
-  log_file_time= stat_arg.st_mtime;
-
-  init_record_id(stat_arg.st_size);
-
   return(0);
 }
 
@@ -434,9 +579,7 @@
 static
 int reopen_log_file()
 {
-  MY_STAT stat_arg;
-
-  if (logger_reopen(audit_file_logger, &stat_arg))
+  if (logger_reopen(audit_file_logger, audit_log_header, audit_log_footer))
   {
     fprintf_timestamp(stderr);
     fprintf(stderr, "Cannot open file %s. ", audit_log_file);
@@ -444,10 +587,6 @@
     return(1);
   }
 
-  log_file_time= stat_arg.st_mtime;
-
-  init_record_id(stat_arg.st_size);
-
   return(0);
 }
 
@@ -456,7 +595,7 @@
 void close_log_file()
 {
   if (audit_file_logger != NULL)
-    logger_close(audit_file_logger);
+    logger_close(audit_file_logger, audit_log_footer);
 }
 
 
@@ -466,6 +605,8 @@
   char buf[1024];
   size_t len;
 
+  logger_init_mutexes();
+
   if (init_new_log_file())
     return(1);
 
@@ -494,7 +635,6 @@
 
   if (audit_log_buffer != NULL)
     audit_log_buffer_shutdown(audit_log_buffer);
-
   close_log_file();
 
   return(0);
@@ -612,7 +752,7 @@
        ASYNCHRONOUS, &audit_log_strategy_typelib);
 
 static const char *audit_log_format_names[]=
-  { "OLD", "NEW", 0 };
+  { "OLD", "NEW", "JSON", "CSV", 0 };
 static TYPELIB audit_log_format_typelib=
 {
     array_elements(audit_log_format_names) - 1, "audit_log_format_typelib",
@@ -674,7 +814,7 @@
 {
   char new_val= *(const char *)(save);
 
-  if (new_val != audit_log_flush && new_val == TRUE)
+  if (new_val != audit_log_flush && new_val)
   {
     audit_log_flush= TRUE;
     reopen_log_file();
 
=== modified file 'plugin/audit_log/file_logger.c'
--- plugin/audit_log/file_logger.c	2014-04-21 12:07:45 +0000
+++ plugin/audit_log/file_logger.c	2014-05-26 07:58:11 +0000
@@ -13,12 +13,11 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <string.h>
-
+#include <my_global.h>
 #include <mysql/plugin.h>
-#include <my_global.h>
 #include <my_sys.h>
 #include <my_pthread.h>
+#include <string.h>
 
 #include "logger.h"
 
@@ -85,14 +84,17 @@
   return (i == 0) ? 0 : ((i < 10) ? 1 : ((i < 100) ? 2 : 3));
 }
 
-
 LOGGER_HANDLE *logger_open(const char *path,
                            unsigned long long size_limit,
                            unsigned int rotations,
                            int thread_safe,
-                           MY_STAT *stat)
+                           logger_prolog_func_t header)
 {
   LOGGER_HANDLE new_log, *l_perm;
+  MY_STAT stat_arg;
+  char buf[128];
+  size_t len;
+
   /*
     I don't think we ever need more rotations,
     but if it's so, the rotation procedure should be adapted to it.
@@ -113,22 +115,19 @@
     return 0;
   }
 
-  if ((new_log.file= open(new_log.path, LOG_FLAGS, 0666)) < 0)
+  if ((new_log.file= my_open(new_log.path, LOG_FLAGS, 0666)) < 0)
   {
     errno= my_errno;
     /* Check errno for the cause */
     return 0;
   }
 
-  if (stat != NULL)
+  if (my_fstat(new_log.file, &stat_arg, MYF(0)))
   {
-    if (my_fstat(new_log.file, stat, MYF(0)))
-    {
-      errno= my_errno;
-      my_close(new_log.file, MYF(0));
-      new_log.file= -1;
-      return 0;
-    }
+    errno= my_errno;
+    my_close(new_log.file, MYF(0));
+    new_log.file= -1;
+    return 0;
   }
 
   if (!(l_perm= (LOGGER_HANDLE *) my_malloc(sizeof(LOGGER_HANDLE), MYF(0))))
@@ -139,22 +138,25 @@
   }
   *l_perm= new_log;
 
-#if defined(HAVE_PSI_INTERFACE) && !defined(FLOGGER_NO_PSI) && !defined(FLOGGER_NO_THREADSAFE)
-  if (PSI_server)
-    PSI_server->register_mutex("file_logger",
-                               mutex_list, array_elements(mutex_list));
-#endif /*HAVE_PSI_INTERFACE && !FLOGGER_NO_PSI*/
-
   flogger_mutex_init(key_LOCK_logger_service, l_perm,
                      MY_MUTEX_INIT_FAST);
 
+  len= header(&stat_arg, buf, sizeof(buf));
+  my_write(l_perm->file, (uchar *)buf, len, MYF(0));
+
   return l_perm;
 }
 
-int logger_close(LOGGER_HANDLE *log)
+int logger_close(LOGGER_HANDLE *log, logger_epilog_func_t footer)
 {
   int result;
   File file= log->file;
+  char buf[128];
+  size_t len;
+
+  len= footer(buf, sizeof(buf));
+  my_write(file, (uchar *)buf, len, MYF(0));
+
   flogger_mutex_destroy(log);
   my_free(log);
   if ((result= my_close(file, MYF(0))))
@@ -163,12 +165,19 @@
 }
 
 
-int logger_reopen(LOGGER_HANDLE *log, MY_STAT *stat)
+int logger_reopen(LOGGER_HANDLE *log, logger_prolog_func_t header,
+                  logger_epilog_func_t footer)
 {
   int result= 0;
+  MY_STAT stat_arg;
+  char buf[128];
+  size_t len;
 
   flogger_mutex_lock(log);
 
+  len= footer(buf, sizeof(buf));
+  my_write(log->file, (uchar *)buf, len, MYF(0));
+
   if ((result= my_close(log->file, MYF(0))))
   {
     errno= my_errno;
@@ -182,19 +191,19 @@
     goto error;
   }
 
-  if (stat != NULL)
+  if ((result= my_fstat(log->file, &stat_arg, MYF(0))))
   {
-    if ((result= my_fstat(log->file, stat, MYF(0))))
-    {
-      errno= my_errno;
-      goto error;
-    }
+    errno= my_errno;
+    goto error;
   }
 
+  len= header(&stat_arg, buf, sizeof(buf));
+  my_write(log->file, (uchar *)buf, len, MYF(0));
+
 error:
   flogger_mutex_unlock(log);
 
-  return 0;
+  return result;
 }
 
 
 
=== modified file 'plugin/audit_log/logger.h'
--- plugin/audit_log/logger.h	2014-04-21 12:07:45 +0000
+++ plugin/audit_log/logger.h	2014-05-26 07:58:11 +0000
@@ -60,20 +60,23 @@
 #endif
 
 typedef struct logger_handle_st LOGGER_HANDLE;
+typedef size_t (logger_prolog_func_t)(MY_STAT *, char *buf, size_t buflen);
+typedef size_t (logger_epilog_func_t)(char *buf, size_t buflen);
 
 void logger_init_mutexes();
 LOGGER_HANDLE *logger_open(const char *path,
                            unsigned long long size_limit,
                            unsigned int rotations,
                            int thread_safe,
-                           MY_STAT *stat);
-int logger_close(LOGGER_HANDLE *log);
+                           logger_prolog_func_t header);
+int logger_close(LOGGER_HANDLE *log, logger_epilog_func_t footer);
 int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr);
 int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...);
 int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
 int logger_rotate(LOGGER_HANDLE *log); 
 int logger_sync(LOGGER_HANDLE *log);
-int logger_reopen(LOGGER_HANDLE *log, MY_STAT *stat);
+int logger_reopen(LOGGER_HANDLE *log, logger_prolog_func_t header,
+                  logger_epilog_func_t footer);
 void logger_set_size_limit(LOGGER_HANDLE *log, unsigned long long size_limit);
 void logger_set_rotations(LOGGER_HANDLE *log, unsigned int rotations);