Merge lp:~sergei.glushchenko/percona-server/5.6-ps-blueprint-audit-log-streaming into lp:percona-server/5.6

[Sergei Glushchenko]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/622/

[Laurynas Biveinis (laurynas-biveinis)]

See the 5.5 comments.

Is this an automerge from 5.5? If not, what are the differences?

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

GCA been taken, lp:~sergei.glushchenko/percona-server/5.5-ps-bug1320879 (which is already in 5.5 trunk) been merged into 5.5 branch. Then feature implemented in 5.5. After that 5.5 branch been merged into 5.6 branch. After this MP been created. No idea why LP shows that many revisions... I did try to merge this branch to branch based on lp:percona-server/5.6 and it merged without any conflicts touching only necessary files.

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/677/

[Laurynas Biveinis (laurynas-biveinis)]

Is this an automerge from 5.5? If not, what are the differences?

review: Needs Information

[Laurynas Biveinis (laurynas-biveinis)]

An automerge as discussed on IRC.

review: Approve

=== removed file 'mysql-test/r/audit_log.result'
--- mysql-test/r/audit_log.result	2014-05-23 16:14:27 +0000
+++ mysql-test/r/audit_log.result	1970-01-01 00:00:00 +0000
@@ -1,304 +0,0 @@
-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 '&;&&&""""<><<>>>>';
-&;&&&""""<><<>>>>
-&;&&&""""<><<>>>>
-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;
 
=== added file 'mysql-test/r/audit_log_csv.result'
--- mysql-test/r/audit_log_csv.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/audit_log_csv.result	2014-07-30 17:21:31 +0000
@@ -0,0 +1,84 @@
+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	1048576
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	CSV
+audit_log_handler	FILE
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+audit_log_syslog_facility	LOG_USER
+audit_log_syslog_ident	percona-audit
+audit_log_syslog_priority	LOG_INFO
+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	1048576
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	CSV
+audit_log_handler	FILE
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+audit_log_syslog_facility	LOG_USER
+audit_log_syslog_ident	percona-audit
+audit_log_syslog_priority	LOG_INFO
+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;
 
=== added file 'mysql-test/r/audit_log_json.result'
--- mysql-test/r/audit_log_json.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/audit_log_json.result	2014-07-30 17:21:31 +0000
@@ -0,0 +1,84 @@
+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	1048576
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	JSON
+audit_log_handler	FILE
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+audit_log_syslog_facility	LOG_USER
+audit_log_syslog_ident	percona-audit
+audit_log_syslog_priority	LOG_INFO
+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	1048576
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	JSON
+audit_log_handler	FILE
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+audit_log_syslog_facility	LOG_USER
+audit_log_syslog_ident	percona-audit
+audit_log_syslog_priority	LOG_INFO
+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;
 
=== added file 'mysql-test/r/audit_log_new.result'
--- mysql-test/r/audit_log_new.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/audit_log_new.result	2014-07-30 17:21:31 +0000
@@ -0,0 +1,84 @@
+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	1048576
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	NEW
+audit_log_handler	FILE
+audit_log_policy	LOGINS
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+audit_log_syslog_facility	LOG_USER
+audit_log_syslog_ident	percona-audit
+audit_log_syslog_priority	LOG_INFO
+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	1048576
+audit_log_file	test_audit.log
+audit_log_flush	OFF
+audit_log_format	NEW
+audit_log_handler	FILE
+audit_log_policy	LOGINS
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	SEMISYNCHRONOUS
+audit_log_syslog_facility	LOG_USER
+audit_log_syslog_ident	percona-audit
+audit_log_syslog_priority	LOG_INFO
+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;
 
=== added file 'mysql-test/r/audit_log_old.result'
--- mysql-test/r/audit_log_old.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/audit_log_old.result	2014-07-30 17:21:31 +0000
@@ -0,0 +1,84 @@
+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_handler	FILE
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	ASYNCHRONOUS
+audit_log_syslog_facility	LOG_USER
+audit_log_syslog_ident	percona-audit
+audit_log_syslog_priority	LOG_INFO
+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_handler	FILE
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	ASYNCHRONOUS
+audit_log_syslog_facility	LOG_USER
+audit_log_syslog_ident	percona-audit
+audit_log_syslog_priority	LOG_INFO
+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;
 
=== added file 'mysql-test/r/audit_log_syslog.result'
--- mysql-test/r/audit_log_syslog.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/audit_log_syslog.result	2014-07-30 17:21:31 +0000
@@ -0,0 +1,83 @@
+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	1048576
+audit_log_file	audit.log
+audit_log_flush	OFF
+audit_log_format	CSV
+audit_log_handler	SYSLOG
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	ASYNCHRONOUS
+audit_log_syslog_facility	LOG_AUTH
+audit_log_syslog_ident	test_audit
+audit_log_syslog_priority	LOG_INFO
+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	1048576
+audit_log_file	audit.log
+audit_log_flush	OFF
+audit_log_format	CSV
+audit_log_handler	SYSLOG
+audit_log_policy	ALL
+audit_log_rotate_on_size	0
+audit_log_rotations	0
+audit_log_strategy	ASYNCHRONOUS
+audit_log_syslog_facility	LOG_AUTH
+audit_log_syslog_ident	test_audit
+audit_log_syslog_priority	LOG_INFO
+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 '&;&&&""""<><<>>>>';
+&;&&&""""<><<>>>>
+&;&&&""""<><<>>>>
 
=== removed file 'mysql-test/t/audit_log-master.opt'
--- mysql-test/t/audit_log-master.opt	2014-04-21 12:07:45 +0000
+++ mysql-test/t/audit_log-master.opt	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-$AUDIT_LOG_OPT
-$AUDIT_LOG_LOAD
---audit_log_file=test_audit.log
---audit_log_buffer_size=4096
 
=== removed file 'mysql-test/t/audit_log.test'
--- mysql-test/t/audit_log.test	2014-05-23 16:14:27 +0000
+++ mysql-test/t/audit_log.test	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
---source include/not_embedded.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
 
=== added file 'mysql-test/t/audit_log_csv-master.opt'
--- mysql-test/t/audit_log_csv-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_csv-master.opt	2014-07-30 17:21:31 +0000
@@ -0,0 +1,5 @@
+$AUDIT_LOG_OPT
+$AUDIT_LOG_LOAD
+--audit_log_file=test_audit.log
+--audit-log-format=CSV
+--audit_log_strategy=SEMISYNCHRONOUS
 
=== added file 'mysql-test/t/audit_log_csv.test'
--- mysql-test/t/audit_log_csv.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_csv.test	2014-07-30 17:21:31 +0000
@@ -0,0 +1,20 @@
+--source include/not_embedded.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_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
 
=== added file 'mysql-test/t/audit_log_json-master.opt'
--- mysql-test/t/audit_log_json-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_json-master.opt	2014-07-30 17:21:31 +0000
@@ -0,0 +1,5 @@
+$AUDIT_LOG_OPT
+$AUDIT_LOG_LOAD
+--audit_log_file=test_audit.log
+--audit-log-format=JSON
+--audit_log_strategy=SEMISYNCHRONOUS
 
=== added file 'mysql-test/t/audit_log_json.test'
--- mysql-test/t/audit_log_json.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_json.test	2014-07-30 17:21:31 +0000
@@ -0,0 +1,18 @@
+--source include/not_embedded.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_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
 
=== added file 'mysql-test/t/audit_log_new-master.opt'
--- mysql-test/t/audit_log_new-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_new-master.opt	2014-07-30 17:21:31 +0000
@@ -0,0 +1,6 @@
+$AUDIT_LOG_OPT
+$AUDIT_LOG_LOAD
+--audit_log_file=test_audit.log
+--audit_log_policy=LOGINS
+--audit-log-format=NEW
+--audit_log_strategy=SEMISYNCHRONOUS
 
=== added file 'mysql-test/t/audit_log_new.test'
--- mysql-test/t/audit_log_new.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_new.test	2014-07-30 17:21:31 +0000
@@ -0,0 +1,15 @@
+--source include/not_embedded.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_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
 
=== added file 'mysql-test/t/audit_log_old-master.opt'
--- mysql-test/t/audit_log_old-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_old-master.opt	2014-07-30 17:21:31 +0000
@@ -0,0 +1,5 @@
+$AUDIT_LOG_OPT
+$AUDIT_LOG_LOAD
+--audit_log_file=test_audit.log
+--audit_log_buffer_size=4096
+--audit_log_strategy=ASYNCHRONOUS
 
=== added file 'mysql-test/t/audit_log_old.test'
--- mysql-test/t/audit_log_old.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_old.test	2014-07-30 17:21:31 +0000
@@ -0,0 +1,15 @@
+--source include/not_embedded.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
 
=== added file 'mysql-test/t/audit_log_syslog-master.opt'
--- mysql-test/t/audit_log_syslog-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_syslog-master.opt	2014-07-30 17:21:31 +0000
@@ -0,0 +1,7 @@
+$AUDIT_LOG_OPT
+$AUDIT_LOG_LOAD
+--audit-log-format=CSV
+--audit_log_handler=SYSLOG
+--audit_log_syslog_ident=test_audit
+--audit_log_syslog_facility=LOG_AUTH
+--audit_log_syslog_priority=LOG_INFO
 
=== added file 'mysql-test/t/audit_log_syslog.test'
--- mysql-test/t/audit_log_syslog.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_syslog.test	2014-07-30 17:21:31 +0000
@@ -0,0 +1,3 @@
+--source include/not_embedded.inc
+
+--source include/audit_log_events.inc
 
=== modified file 'plugin/audit_log/CMakeLists.txt'
--- plugin/audit_log/CMakeLists.txt	2014-04-21 12:07:45 +0000
+++ plugin/audit_log/CMakeLists.txt	2014-07-30 17:21:31 +0000
@@ -13,5 +13,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-MYSQL_ADD_PLUGIN(audit_log audit_log.c file_logger.c buffer.c
+MYSQL_ADD_PLUGIN(audit_log audit_log.c file_logger.c buffer.c audit_file.c
+ audit_syslog.c
  MODULE_ONLY MODULE_OUTPUT_NAME "audit_log")
 
=== added file 'plugin/audit_log/audit_file.c'
--- plugin/audit_log/audit_file.c	1970-01-01 00:00:00 +0000
+++ plugin/audit_log/audit_file.c	2014-07-30 17:21:31 +0000
@@ -0,0 +1,200 @@
+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#include "audit_handler.h"
+#include "buffer.h"
+
+typedef struct audit_handler_file_data_struct audit_handler_file_data_t;
+
+struct audit_handler_file_data_struct
+{
+  size_t struct_size;
+  LOGGER_HANDLE *logger;
+  logger_prolog_func_t header;
+  logger_epilog_func_t footer;
+  my_bool sync_on_write;
+  my_bool use_buffer;
+  audit_log_buffer_t *buffer;
+};
+
+static
+int audit_handler_file_write(audit_handler_t *handler,
+                             const char *buf, size_t len);
+static
+int audit_handler_file_flush(audit_handler_t *handler);
+static
+int audit_handler_file_close(audit_handler_t *handler);
+static
+int audit_handler_file_write_nobuf(LOGGER_HANDLE *logger,
+                                   const char *buf, size_t len);
+static
+int audit_handler_file_write_buf(audit_log_buffer_t *buffer,
+                                 const char *buf, size_t len);
+static
+void audit_handler_file_set_option(audit_handler_t *handler,
+                                   audit_handler_option_t opt, void *val);
+
+static
+int write_callback(void *data, const char *buf, size_t len)
+{
+  audit_handler_t *handler= (audit_handler_t *) data;
+  audit_handler_file_data_t *hdata= (audit_handler_file_data_t*) handler->data;
+
+  DBUG_ASSERT(hdata->struct_size == sizeof(audit_handler_file_data_t));
+
+  return audit_handler_file_write_nobuf(hdata->logger, buf, len);
+}
+
+
+audit_handler_t *audit_handler_file_open(audit_handler_file_config_t *opts)
+{
+  audit_handler_t *handler= (audit_handler_t*)
+         calloc(sizeof(audit_handler_t) + sizeof(audit_handler_file_data_t), 1);
+  if (handler != NULL)
+  {
+    audit_handler_file_data_t *data= (audit_handler_file_data_t*) (handler + 1);
+    data->struct_size= sizeof(audit_handler_file_data_t);
+    data->footer= opts->footer;
+    data->header= opts->header;
+    data->sync_on_write= opts->sync_on_write;
+    data->use_buffer= opts->use_buffer;
+    if (data->use_buffer)
+    {
+      data->buffer= audit_log_buffer_init(opts->buffer_size,
+                                       opts->can_drop_data,
+                                       write_callback, handler);
+      if (data->buffer == NULL)
+        goto error;
+    }
+    data->logger= logger_open(opts->name, opts->rotate_on_size,
+                              opts->rotate_on_size ? opts->rotations : 0,
+                              !opts->use_buffer, opts->header);
+    if (data->logger == NULL)
+    {
+      goto error;
+    }
+    handler->data= data;
+    handler->write= audit_handler_file_write;
+    handler->flush= audit_handler_file_flush;
+    handler->close= audit_handler_file_close;
+    handler->set_option= audit_handler_file_set_option;
+    goto success;
+error:
+    if (data->use_buffer)
+    {
+      free(data->buffer);
+    }
+    free(handler);
+    handler= NULL;
+  }
+success:
+  return handler;
+}
+
+static
+int audit_handler_file_write_nobuf(LOGGER_HANDLE *logger,
+                                   const char *buf, size_t len)
+{
+  return logger_write(logger, buf, len);
+}
+
+static
+int audit_handler_file_write_buf(audit_log_buffer_t *buffer,
+                                 const char *buf, size_t len)
+{
+  return audit_log_buffer_write(buffer, buf, len);
+}
+
+static
+int audit_handler_file_write(audit_handler_t *handler,
+                             const char *buf, size_t len)
+{
+  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
+  int res;
+
+  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
+
+  if (data->use_buffer)
+  {
+    DBUG_ASSERT(data->buffer);
+    res= audit_handler_file_write_buf(data->buffer, buf, len);
+  }
+  else
+  {
+    DBUG_ASSERT(data->logger);
+    res= audit_handler_file_write_nobuf(data->logger, buf, len);
+
+    if (data->sync_on_write)
+    {
+      logger_sync(data->logger);
+    }
+  }
+
+  return res;
+}
+
+static
+int audit_handler_file_flush(audit_handler_t *handler)
+{
+  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
+  LOGGER_HANDLE* logger;
+
+  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
+
+  logger= data->logger;
+
+  return logger_reopen(logger, data->header, data->footer);
+}
+
+static
+int audit_handler_file_close(audit_handler_t *handler)
+{
+  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
+  int res;
+  LOGGER_HANDLE* logger;
+
+  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_file_data_t));
+
+  logger= data->logger;
+
+  if (data->use_buffer)
+  {
+    audit_log_buffer_shutdown(data->buffer);
+  }
+
+  res= logger_close(logger, data->footer);
+
+  free(handler);
+
+  return res;
+}
+
+static
+void audit_handler_file_set_option(audit_handler_t *handler,
+                                   audit_handler_option_t opt, void *val)
+{
+  audit_handler_file_data_t *data= (audit_handler_file_data_t*) handler->data;
+
+  switch (opt)
+  {
+  case OPT_ROTATIONS:
+    logger_set_size_limit(data->logger, *(ulonglong*)(val));
+    break;
+  case OPT_ROTATE_ON_SIZE:
+    logger_set_rotations(data->logger, *(ulonglong*)(val));
+    break;
+  }
+}
 
=== added file 'plugin/audit_log/audit_handler.h'
--- plugin/audit_log/audit_handler.h	1970-01-01 00:00:00 +0000
+++ plugin/audit_log/audit_handler.h	2014-07-30 17:21:31 +0000
@@ -0,0 +1,116 @@
+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+
+#ifndef AUDIT_HANDLER_INCLUDED
+#define AUDIT_HANDLER_INCLUDED
+
+#include <my_global.h>
+
+#include "logger.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct audit_handler_struct audit_handler_t;
+typedef struct audit_handler_file_config_struct audit_handler_file_config_t;
+typedef struct audit_handler_syslog_config_struct audit_handler_syslog_config_t;
+typedef struct audit_handler_buffered_struct audit_handler_buffered_t;
+typedef void * audit_handler_data_t;
+
+
+typedef enum { OPT_ROTATE_ON_SIZE, OPT_ROTATIONS } audit_handler_option_t;
+
+struct audit_handler_struct
+{
+  int (*write)(audit_handler_t *, const char *, size_t);
+  int (*flush)(audit_handler_t *);
+  int (*close)(audit_handler_t *);
+  void (*set_option)(audit_handler_t *, audit_handler_option_t, void *);
+  audit_handler_data_t data;
+};
+
+struct audit_handler_file_config_struct
+{
+  const char *name;
+  size_t rotate_on_size;
+  size_t rotations;
+  my_bool sync_on_write;
+  my_bool use_buffer;
+  size_t buffer_size;
+  my_bool can_drop_data;
+  logger_prolog_func_t header;
+  logger_epilog_func_t footer;
+};
+
+struct audit_handler_syslog_config_struct
+{
+  const char *ident;
+  int facility;
+  int priority;
+  logger_prolog_func_t header;
+  logger_epilog_func_t footer;
+};
+
+static inline
+int audit_handler_write(audit_handler_t *handler, const char *buf, size_t len)
+{
+  if (handler->write != NULL)
+  {
+    return handler->write(handler, buf, len);
+  }
+  return len;
+}
+
+static inline
+int audit_handler_flush(audit_handler_t *handler)
+{
+  if (handler->flush != NULL)
+  {
+    return handler->flush(handler);
+  }
+  return 0;
+}
+
+static inline
+int audit_handler_close(audit_handler_t *handler)
+{
+  if (handler->close != NULL)
+  {
+    return handler->close(handler);
+  }
+  return 0;
+}
+
+static inline
+void audit_handler_set_option(audit_handler_t *handler,
+                              audit_handler_option_t opt, void *val)
+{
+  if (handler->set_option != NULL)
+  {
+    handler->set_option(handler, opt, val);
+  }
+}
+
+audit_handler_t *audit_handler_file_open(audit_handler_file_config_t *opts);
+audit_handler_t *audit_handler_syslog_open(audit_handler_syslog_config_t *opts);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
 
=== modified file 'plugin/audit_log/audit_log.c'
--- plugin/audit_log/audit_log.c	2014-05-23 16:14:27 +0000
+++ plugin/audit_log/audit_log.c	2014-07-30 17:21:31 +0000
@@ -25,22 +25,24 @@
 #include <mysql_version.h>
 #include <mysql_com.h>
 #include <my_pthread.h>
+#include <syslog.h>
 
 #include "logger.h"
 #include "buffer.h"
+#include "audit_handler.h"
 
-#define PLUGIN_VERSION 0x0001
+#define PLUGIN_VERSION 0x0002
 
 
 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, JSON, CSV };
+enum audit_log_handler_t { HANDLER_FILE, HANDLER_SYSLOG };
 
 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;
+static audit_handler_t *log_handler= NULL;
 static ulonglong record_id= 0;
 static time_t log_file_time= 0;
 char *audit_log_file;
@@ -52,6 +54,43 @@
 ulonglong audit_log_rotations= 0;
 char audit_log_flush= FALSE;
 ulong audit_log_format= OLD;
+ulong audit_log_handler= HANDLER_FILE;
+char *audit_log_syslog_ident;
+char default_audit_log_syslog_ident[] = "percona-audit";
+ulong audit_log_syslog_facility= 0;
+ulong audit_log_syslog_priority= 0;
+
+
+static int audit_log_syslog_facility_codes[]=
+  { LOG_USER,   LOG_AUTHPRIV, LOG_CRON,   LOG_DAEMON, LOG_FTP,
+    LOG_KERN,   LOG_LPR,      LOG_MAIL,   LOG_NEWS,
+#if (defined LOG_SECURITY)
+    LOG_SECURITY,
+#endif
+    LOG_SYSLOG, LOG_AUTH,     LOG_UUCP,   LOG_LOCAL0, LOG_LOCAL1,
+    LOG_LOCAL2, LOG_LOCAL3,   LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6,
+    LOG_LOCAL7, 0};
+
+
+static const char *audit_log_syslog_facility_names[]=
+  { "LOG_USER",   "LOG_AUTHPRIV", "LOG_CRON",   "LOG_DAEMON", "LOG_FTP",
+    "LOG_KERN",   "LOG_LPR",      "LOG_MAIL",   "LOG_NEWS",
+#if (defined LOG_SECURITY)
+    "LOG_SECURITY",
+#endif
+    "LOG_SYSLOG", "LOG_AUTH",     "LOG_UUCP",   "LOG_LOCAL0", "LOG_LOCAL1",
+    "LOG_LOCAL2", "LOG_LOCAL3",   "LOG_LOCAL4", "LOG_LOCAL5", "LOG_LOCAL6",
+    "LOG_LOCAL7", 0 };
+
+
+static const int audit_log_syslog_priority_codes[]=
+  { LOG_INFO,   LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING,
+    LOG_NOTICE, LOG_EMERG,  LOG_DEBUG, 0 };
+
+
+static const char *audit_log_syslog_priority_names[]=
+  { "LOG_INFO",   "LOG_ALERT", "LOG_CRIT", "LOG_ERR", "LOG_WARNING",
+    "LOG_NOTICE", "LOG_EMERG", "LOG_DEBUG", 0 };
 
 
 static
@@ -228,14 +267,15 @@
   return out;
 }
 
+
 static
-void logger_write_safe(LOGGER_HANDLE *log, const char *buffer, size_t size)
+void audit_log_write(const char *buf, size_t len)
 {
   static int write_error= 0;
 
-  if (log != NULL)
+  if (log_handler != NULL)
   {
-    if (logger_write(log, buffer, size) < 0)
+    if (audit_handler_write(log_handler, buf, len) < 0)
     {
       if (!write_error)
       {
@@ -253,44 +293,6 @@
 }
 
 
-static 
-void logger_write_safe_void(void *log, const char *buffer, size_t size)
-{
-  logger_write_safe((LOGGER_HANDLE *)log, buffer, size);
-}
-
-
-static
-void audit_log_write_without_buffer(const char *buf, size_t len)
-{
-  logger_write_safe(audit_file_logger, buf, len);
-  if (audit_log_strategy == SYNCHRONOUS && audit_file_logger != NULL)
-  {
-    logger_sync(audit_file_logger);
-  }
-}
-
-
-static
-void audit_log_write(const char *buf, size_t len)
-{
-  switch (audit_log_strategy)
-  {
-    case ASYNCHRONOUS:
-    case PERFORMANCE:
-      if (audit_log_buffer != NULL)
-        audit_log_buffer_write(audit_log_buffer, buf, len);
-      break;
-    case SEMISYNCHRONOUS:
-    case SYNCHRONOUS:
-      audit_log_write_without_buffer(buf, len);
-      break;
-    default:
-      DBUG_ASSERT(0);
-  }
-}
-
-
 
 /* Defined in MySQL server */
 extern int orig_argc;
@@ -541,6 +543,11 @@
 
   init_record_id(stat->st_size);
 
+  if (buf == NULL)
+  {
+    return 0;
+  }
+
   return my_snprintf(buf, buflen, format_string[audit_log_format]);
 }
 
@@ -554,22 +561,56 @@
                      "",
                      "" };
 
+  if (buf == NULL)
+  {
+    return 0;
+  }
+
   return my_snprintf(buf, buflen, format_string[audit_log_format]);
 }
 
 static
 int init_new_log_file()
 {
-  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,
-                            audit_log_header);
-  if (audit_file_logger == NULL)
-  {
-    fprintf_timestamp(stderr);
-    fprintf(stderr, "Cannot open file %s. ", audit_log_file);
-    perror("Error: ");
-    return(1);
+  if (audit_log_handler == HANDLER_FILE)
+  {
+    audit_handler_file_config_t opts;
+    opts.name= audit_log_file;
+    opts.rotate_on_size= audit_log_rotate_on_size;
+    opts.rotations= audit_log_rotations;
+    opts.sync_on_write= audit_log_strategy == SYNCHRONOUS;
+    opts.use_buffer= audit_log_strategy < SEMISYNCHRONOUS;
+    opts.buffer_size= audit_log_buffer_size;
+    opts.can_drop_data= audit_log_strategy == PERFORMANCE;
+    opts.header= audit_log_header;
+    opts.footer= audit_log_footer;
+
+    log_handler= audit_handler_file_open(&opts);
+    if (log_handler == NULL)
+    {
+      fprintf_timestamp(stderr);
+      fprintf(stderr, "Cannot open file %s. ", audit_log_file);
+      perror("Error: ");
+      return(1);
+    }
+  }
+  else
+  {
+    audit_handler_syslog_config_t opts;
+    opts.facility= audit_log_syslog_facility_codes[audit_log_syslog_facility];
+    opts.ident= audit_log_syslog_ident;
+    opts.priority= audit_log_syslog_priority_codes[audit_log_syslog_priority];
+    opts.header= audit_log_header;
+    opts.footer= audit_log_footer;
+
+    log_handler= audit_handler_syslog_open(&opts);
+    if (log_handler == NULL)
+    {
+      fprintf_timestamp(stderr);
+      fprintf(stderr, "Cannot open syslog. ");
+      perror("Error: ");
+      return(1);
+    }
   }
 
   return(0);
@@ -579,12 +620,15 @@
 static
 int reopen_log_file()
 {
-  if (logger_reopen(audit_file_logger, audit_log_header, audit_log_footer))
+  if (log_handler != NULL)
   {
-    fprintf_timestamp(stderr);
-    fprintf(stderr, "Cannot open file %s. ", audit_log_file);
-    perror("Error: ");
-    return(1);
+    if (audit_handler_flush(log_handler))
+    {
+      fprintf_timestamp(stderr);
+      fprintf(stderr, "Cannot open file %s. ", audit_log_file);
+      perror("Error: ");
+      return(1);
+    }
   }
 
   return(0);
@@ -592,14 +636,6 @@
 
 
 static
-void close_log_file()
-{
-  if (audit_file_logger != NULL)
-    logger_close(audit_file_logger, audit_log_footer);
-}
-
-
-static
 int audit_log_plugin_init(void *arg __attribute__((unused)))
 {
   char buf[1024];
@@ -610,13 +646,6 @@
   if (init_new_log_file())
     return(1);
 
-  if (audit_log_strategy < SEMISYNCHRONOUS)
-  {
-    audit_log_buffer= audit_log_buffer_init(audit_log_buffer_size,
-      audit_log_strategy == PERFORMANCE, logger_write_safe_void,
-      audit_file_logger);
-  }
-
   len= audit_log_audit_record(buf, sizeof(buf), "Audit", time(NULL));
   audit_log_write(buf, len);
 
@@ -633,9 +662,7 @@
   len= audit_log_audit_record(buf, sizeof(buf), "NoAudit", time(NULL));
   audit_log_write(buf, len);
 
-  if (audit_log_buffer != NULL)
-    audit_log_buffer_shutdown(audit_log_buffer);
-  close_log_file();
+  audit_handler_close(log_handler);
 
   return(0);
 }
@@ -729,8 +756,8 @@
 
 static TYPELIB audit_log_policy_typelib=
 {
-    array_elements(audit_log_policy_names) - 1, "audit_log_policy_typelib",
-    audit_log_policy_names, NULL
+  array_elements(audit_log_policy_names) - 1, "audit_log_policy_typelib",
+  audit_log_policy_names, NULL
 };
 
 static MYSQL_SYSVAR_ENUM(policy, audit_log_policy, PLUGIN_VAR_RQCMDARG,
@@ -742,21 +769,22 @@
   { "ASYNCHRONOUS", "PERFORMANCE", "SEMISYNCHRONOUS", "SYNCHRONOUS", 0 };
 static TYPELIB audit_log_strategy_typelib=
 {
-    array_elements(audit_log_strategy_names) - 1, "audit_log_strategy_typelib",
-    audit_log_strategy_names, NULL
+  array_elements(audit_log_strategy_names) - 1, "audit_log_strategy_typelib",
+  audit_log_strategy_names, NULL
 };
 
 static MYSQL_SYSVAR_ENUM(strategy, audit_log_strategy,
        PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-       "The logging method used by the audit log plugin.", NULL, NULL,
+       "The logging method used by the audit log plugin, "
+       "if FILE handler is used.", NULL, NULL,
        ASYNCHRONOUS, &audit_log_strategy_typelib);
 
 static const char *audit_log_format_names[]=
   { "OLD", "NEW", "JSON", "CSV", 0 };
 static TYPELIB audit_log_format_typelib=
 {
-    array_elements(audit_log_format_names) - 1, "audit_log_format_typelib",
-    audit_log_format_names, NULL
+  array_elements(audit_log_format_names) - 1, "audit_log_format_typelib",
+  audit_log_format_names, NULL
 };
 
 static MYSQL_SYSVAR_ENUM(format, audit_log_format,
@@ -764,9 +792,23 @@
        "The audit log file format.", NULL, NULL,
        ASYNCHRONOUS, &audit_log_format_typelib);
 
+static const char *audit_log_handler_names[]=
+  { "FILE", "SYSLOG", 0 };
+static TYPELIB audit_log_handler_typelib=
+{
+  array_elements(audit_log_handler_names) - 1, "audit_log_handler_typelib",
+  audit_log_handler_names, NULL
+};
+
+static MYSQL_SYSVAR_ENUM(handler, audit_log_handler,
+       PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
+       "The audit log handler.", NULL, NULL,
+       HANDLER_FILE, &audit_log_handler_typelib);
+
 static MYSQL_SYSVAR_ULONGLONG(buffer_size, audit_log_buffer_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "The size of the buffer for asynchronous logging.",
+  "The size of the buffer for asynchronous logging, "
+  "if FILE handler is used.",
   NULL, NULL, 1048576UL, 4096UL, ULONGLONG_MAX, 4096UL);
 
 static
@@ -778,13 +820,15 @@
 {
   ulonglong new_val= *(ulonglong *)(save);
 
-  if (audit_file_logger)
-    logger_set_size_limit(audit_file_logger, new_val);
+  if (log_handler != NULL)
+    audit_handler_set_option(log_handler, OPT_ROTATE_ON_SIZE, &new_val);
+
+  audit_log_rotate_on_size= new_val;
 }
 
 static MYSQL_SYSVAR_ULONGLONG(rotate_on_size, audit_log_rotate_on_size,
   PLUGIN_VAR_RQCMDARG,
-  "Maximum size of the log to start the rotation.",
+  "Maximum size of the log to start the rotation, if FILE handler is used.",
   NULL, audit_log_rotate_on_size_update, 0UL, 0UL, ULONGLONG_MAX, 4096UL);
 
 static
@@ -796,13 +840,15 @@
 {
   ulonglong new_val= *(ulonglong *)(save);
 
-  if (audit_file_logger)
-    logger_set_rotations(audit_file_logger, new_val);
+  if (log_handler != NULL)
+    audit_handler_set_option(log_handler, OPT_ROTATIONS, &new_val);
+
+  audit_log_rotations= new_val;
 }
 
 static MYSQL_SYSVAR_ULONGLONG(rotations, audit_log_rotations,
   PLUGIN_VAR_RQCMDARG,
-  "Maximum number of rotations to keep.",
+  "Maximum number of rotations to keep, if FILE handler is used.",
   NULL, audit_log_rotations_update, 0UL, 0UL, 999UL, 1UL);
 
 static
@@ -826,6 +872,39 @@
        PLUGIN_VAR_OPCMDARG, "Flush the log file.", NULL,
        audit_log_flush_update, 0);
 
+static MYSQL_SYSVAR_STR(syslog_ident, audit_log_syslog_ident,
+  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
+  "The string that will be prepended to each log message, "
+  "if SYSLOG handler is used.",
+  NULL, NULL, default_audit_log_syslog_ident);
+
+static TYPELIB audit_log_syslog_facility_typelib=
+{
+  array_elements(audit_log_syslog_facility_names) - 1,
+  "audit_log_syslog_facility_typelib",
+  audit_log_syslog_facility_names, NULL
+};
+
+static MYSQL_SYSVAR_ENUM(syslog_facility, audit_log_syslog_facility,
+       PLUGIN_VAR_RQCMDARG,
+       "The syslog facility to assign to messages, if SYSLOG handler is used.",
+       NULL, NULL, 0,
+       &audit_log_syslog_facility_typelib);
+
+static TYPELIB audit_log_syslog_priority_typelib=
+{
+  array_elements(audit_log_syslog_priority_names) - 1,
+  "audit_log_syslog_priority_typelib",
+  audit_log_syslog_priority_names, NULL
+};
+
+static MYSQL_SYSVAR_ENUM(syslog_priority, audit_log_syslog_priority,
+       PLUGIN_VAR_RQCMDARG,
+       "Priority to be assigned to all messages written to syslog.",
+       NULL, NULL, 0,
+       &audit_log_syslog_priority_typelib);
+
+
 static struct st_mysql_sys_var* audit_log_system_variables[] =
 {
   MYSQL_SYSVAR(file),
@@ -836,6 +915,10 @@
   MYSQL_SYSVAR(rotate_on_size),
   MYSQL_SYSVAR(rotations),
   MYSQL_SYSVAR(flush),
+  MYSQL_SYSVAR(handler),
+  MYSQL_SYSVAR(syslog_ident),
+  MYSQL_SYSVAR(syslog_priority),
+  MYSQL_SYSVAR(syslog_facility),
   NULL
 };
 
 
=== added file 'plugin/audit_log/audit_syslog.c'
--- plugin/audit_log/audit_syslog.c	1970-01-01 00:00:00 +0000
+++ plugin/audit_log/audit_syslog.c	2014-07-30 17:21:31 +0000
@@ -0,0 +1,91 @@
+/* Copyright (c) 2014 Percona LLC and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; version 2 of
+   the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#include <syslog.h>
+#include <string.h>
+#include "audit_handler.h"
+
+typedef struct audit_handler_syslog_data_struct audit_handler_syslog_data_t;
+
+struct audit_handler_syslog_data_struct
+{
+  size_t struct_size;
+  int priority;
+  logger_prolog_func_t header;
+  logger_epilog_func_t footer;
+};
+
+int audit_handler_syslog_write(audit_handler_t *handler,
+                               const char *buf, size_t len);
+int audit_handler_syslog_flush(audit_handler_t *handler);
+int audit_handler_syslog_close(audit_handler_t *handler);
+
+
+audit_handler_t *audit_handler_syslog_open(audit_handler_syslog_config_t *opts)
+{
+  audit_handler_t *handler= (audit_handler_t*)
+       calloc(sizeof(audit_handler_t) + sizeof(audit_handler_syslog_data_t), 1);
+  if (handler != NULL)
+  {
+    audit_handler_syslog_data_t *data=
+                                   (audit_handler_syslog_data_t*) (handler + 1);
+    MY_STAT stat_arg;
+
+    data->struct_size= sizeof(audit_handler_syslog_data_t);
+    data->priority= opts->priority;
+    data->header= opts->header;
+    data->footer= opts->footer;
+    openlog(opts->ident, 0, opts->facility);
+    memset(&stat_arg, 0, sizeof(stat_arg));
+    opts->header(&stat_arg, NULL, 0);
+    handler->data= data;
+    handler->write= audit_handler_syslog_write;
+    handler->flush= audit_handler_syslog_flush;
+    handler->close= audit_handler_syslog_close;
+  }
+  return handler;
+}
+
+int audit_handler_syslog_write(audit_handler_t *handler,
+                               const char *buf, size_t len)
+{
+  audit_handler_syslog_data_t *data=
+                                   (audit_handler_syslog_data_t*) handler->data;
+  DBUG_ASSERT(data->struct_size == sizeof(audit_handler_syslog_data_t));
+  syslog(data->priority, "%s", buf);
+  return len;
+}
+
+int audit_handler_syslog_flush(audit_handler_t *handler)
+{
+  audit_handler_syslog_data_t *data=
+                                   (audit_handler_syslog_data_t*) handler->data;
+  MY_STAT stat_arg;
+  memset(&stat_arg, 0, sizeof(stat_arg));
+  data->header(&stat_arg, NULL, 0);
+  data->footer(NULL, 0);
+  return 0;
+}
+
+int audit_handler_syslog_close(audit_handler_t *handler)
+{
+  audit_handler_syslog_data_t *data=
+                                   (audit_handler_syslog_data_t*) handler->data;
+  data->footer(NULL, 0);
+  closelog();
+  free(handler);
+  return 0;
+}
 
=== modified file 'plugin/audit_log/buffer.h'
--- plugin/audit_log/buffer.h	2014-04-21 12:07:45 +0000
+++ plugin/audit_log/buffer.h	2014-07-30 17:21:31 +0000
@@ -20,13 +20,22 @@
 
 #include <string.h> // for size_t
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct audit_log_buffer audit_log_buffer_t;
 
-typedef void (*audit_log_write_func)(void *data, const char *buf, size_t len);
+typedef int (*audit_log_write_func)(void *data, const char *buf, size_t len);
 
 audit_log_buffer_t *audit_log_buffer_init(size_t size, int drop_if_full,
                                  audit_log_write_func write_func, void *data);
 void audit_log_buffer_shutdown(audit_log_buffer_t *log);
-int audit_log_buffer_write(audit_log_buffer_t *log, const char *buf, size_t len);
+int audit_log_buffer_write(audit_log_buffer_t *log,
+                           const char *buf, size_t len);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
 
=== modified file 'plugin/audit_log/logger.h'
--- plugin/audit_log/logger.h	2014-05-23 16:14:27 +0000
+++ plugin/audit_log/logger.h	2014-07-30 17:21:31 +0000
@@ -60,8 +60,8 @@
 #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);
+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,