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

[Sergei Glushchenko]

Test case for Audit Plugin + Threadpool

[Sergei Glushchenko (sergei.glushchenko)]

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

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

Could you please discard rev 671 and recommit rev 672 on a recent GCA?

$ bzr merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1335590
Warning: criss-cross merge encountered. See bzr help criss-cross.
+N mysql-test/r/audit_log.result.OTHER
+N mysql-test/r/audit_log_threadpool.result
+N mysql-test/t/audit_log.test.OTHER
+N mysql-test/t/audit_log_threadpool-master.opt
+N mysql-test/t/audit_log_threadpool.test
+N plugin/audit_log/audit_file.c
+N plugin/audit_log/audit_handler.h
+N plugin/audit_log/audit_syslog.c
R plugin/audit_log/audit_file.c => plugin/audit_log/audit_file.c.moved
R plugin/audit_log/audit_handler.h => plugin/audit_log/audit_handler.h.moved
 M plugin/audit_log/audit_log.c
R plugin/audit_log/audit_syslog.c => plugin/audit_log/audit_syslog.c.moved
 M plugin/audit_log/buffer.h
 M plugin/audit_log/logger.h
Contents conflict in mysql-test/r/audit_log.result
Contents conflict in mysql-test/t/audit_log.test
Conflict adding file plugin/audit_log/audit_file.c. Moved existing file to plugin/audit_log/audit_file.c.moved.
Conflict adding file plugin/audit_log/audit_handler.h. Moved existing file to plugin/audit_log/audit_handler.h.moved.
Text conflict in plugin/audit_log/audit_log.c
Conflict adding file plugin/audit_log/audit_syslog.c. Moved existing file to plugin/audit_log/audit_syslog.c.moved.
Text conflict in plugin/audit_log/buffer.h
Text conflict in plugin/audit_log/logger.h
8 conflicts encountered.

review: Needs Fixing

[Sergei Glushchenko (sergei.glushchenko)]

Rebased on recent GCA

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

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'mysql-test/r/audit_log_threadpool.result'
--- mysql-test/r/audit_log_threadpool.result	1970-01-01 00:00:00 +0000
+++ mysql-test/r/audit_log_threadpool.result	2014-10-07 09:25:43 +0000
@@ -0,0 +1,9 @@
+set global audit_log_flush= ON;
+select 1;
+1
+1
+select '1more';
+1more
+1more
+set global audit_log_flush= ON;
+1 connects, 1 disconnects

=== added file 'mysql-test/t/audit_log_threadpool-master.opt'
--- mysql-test/t/audit_log_threadpool-master.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_threadpool-master.opt	2014-10-07 09:25:43 +0000
@@ -0,0 +1,5 @@
+$AUDIT_LOG_OPT
+$AUDIT_LOG_LOAD
+--audit_log_strategy=SYNCHRONOUS
+--audit_log_file=test_audit_threadpool.log
+--thread_handling=pool-of-threads
\ No newline at end of file

=== added file 'mysql-test/t/audit_log_threadpool.test'
--- mysql-test/t/audit_log_threadpool.test	1970-01-01 00:00:00 +0000
+++ mysql-test/t/audit_log_threadpool.test	2014-10-07 09:25:43 +0000
@@ -0,0 +1,40 @@
+--source include/not_embedded.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+let MYSQLD_DATADIR= $MYSQLD_DATADIR;
+
+--move_file $MYSQLD_DATADIR/test_audit_threadpool.log $MYSQLD_DATADIR/test_audit_threadpool_garbage.log
+set global audit_log_flush= ON;
+
+--source include/count_sessions.inc
+connect (con1,localhost,root,,mysql);
+select 1;
+connection default;
+disconnect con1;
+--source include/wait_until_count_sessions.inc
+
+connection default;
+select '1more';
+
+--move_file $MYSQLD_DATADIR/test_audit_threadpool.log $MYSQLD_DATADIR/test_audit_threadpool_done.log
+set global audit_log_flush= ON;
+
+perl;
+  use strict;
+  use warnings;
+
+  my $logfile = $ENV{'MYSQLD_DATADIR'} . '/test_audit_threadpool_done.log';
+
+  open(FILE, $logfile) or die "cannot open $logfile!";
+  my @buf = <FILE>;
+  close(FILE);
+
+  my $connect_count = grep(/Connect/, @buf);
+  my $disconnect_count = grep(/Quit/, @buf);
+
+  print "$connect_count connects, $disconnect_count disconnects\n";
+EOF
+
+--remove_file $MYSQLD_DATADIR/test_audit_threadpool.log
+--remove_file $MYSQLD_DATADIR/test_audit_threadpool_garbage.log
+--remove_file $MYSQLD_DATADIR/test_audit_threadpool_done.log