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

Proposed by Sergei Glushchenko on 2014-10-06
Status: Merged
Approved by: Laurynas Biveinis on 2014-10-06
Approved revision: 692
Merged at revision: 703
Proposed branch: lp:~sergei.glushchenko/percona-server/5.5-ps-bug1369950
Merge into: lp:percona-server/5.5
Diff against target: 12 lines (+1/-1)
1 file modified
mysql-test/t/audit_log_csv.test (+1/-1)
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1369950
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-10-06 Approve on 2014-10-06
Review via email: mp+237229@code.launchpad.net

Description of the change

Bug 1369950: audit_log_csv fails on centos 5 and ubuntu saucy

Text::CSV constructor does not support auto_diag argument. This
argument is not actually needed, because error_diag called manually
anyway

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/t/audit_log_csv.test'
2--- mysql-test/t/audit_log_csv.test 2014-07-30 19:36:26 +0000
3+++ mysql-test/t/audit_log_csv.test 2014-10-06 10:14:13 +0000
4@@ -9,7 +9,7 @@
5 set global audit_log_flush= ON;
6 perl;
7 eval "use Text::CSV; 1" or exit 0;
8- my $p = Text::CSV->new({ binary => 1, auto_diag => 1, sep_char => ',' });
9+ my $p = Text::CSV->new({ binary => 1, sep_char => ',' });
10 open my $file, $ENV{'MYSQLD_DATADIR'} . '/test_audit_csv.log' or die "Could not open log: $!";
11 while ($p->getline($file)) {};
12 if (not $p->eof) {

Subscribers

People subscribed via source and target branches