Code review comment for lp:~sergei.glushchenko/percona-server/5.5-ps-bug1335590

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.