Percona Server moved to https://jira.percona.com/projects/PS

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

5.5-ps-bug1335590
Merge into 5.5

Proposed by Sergei Glushchenko on 2014-06-30

Status:

Merged

Approved by:

Laurynas Biveinis on 2014-10-08

Approved revision:

no longer in the source branch.

Merged at revision:

704

Proposed branch:

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

Merge into:

lp://staging/percona-server/5.5

Prerequisite:

lp://staging/~sergei.glushchenko/percona-server/5.5-ps-blueprint-audit-log-streaming

Diff against target:

69 lines (+54/-0)

3 files modified

mysql-test/r/audit_log_threadpool.result (+9/-0)
mysql-test/t/audit_log_threadpool-master.opt (+5/-0)
mysql-test/t/audit_log_threadpool.test (+40/-0)

To merge this branch:

bzr merge lp://staging/~sergei.glushchenko/percona-server/5.5-ps-bug1335590

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Laurynas Biveinis (community)		Approve on 2014-10-08
Registry Administrators	2014-06-30	Pending
Review via email: mp+224953@code.staging.launchpad.net

Description of the change

Test case for Audit Plugin + Threadpool

Revision history for this message

Sergei Glushchenko (sergei.glushchenko) wrote on 2014-06-30:

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

Revision history for this message

Laurynas Biveinis (laurynas-biveinis) on 2014-10-07:

review: Approve

Revision history for this message

Laurynas Biveinis (laurynas-biveinis) wrote on 2014-10-07:

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.