Merge lp:~percona-toolkit-dev/percona-toolkit/fix-genlog-parser-bug-1078838 into lp:percona-toolkit/2.1

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2012-11-29 20:10:54 +0000
+++ bin/pt-query-digest	2012-12-10 23:39:22 +0000
@@ -9692,7 +9692,8 @@
                $cmd = $arg;
             }
             else {
-               my ($user, undef, $db) = $arg =~ /(\S+)/g;
+               my ($user) = $arg =~ m/(\S+)/;
+               my ($db)   = $arg =~ m/on (\S+)/;
                my $host;
                ($user, $host) = split(/@/, $user);
                PTDEBUG && _d('Connect', $user, '@', $host, 'on', $db);

=== modified file 'lib/GeneralLogParser.pm'
--- lib/GeneralLogParser.pm	2012-01-19 19:46:56 +0000
+++ lib/GeneralLogParser.pm	2012-12-10 23:39:22 +0000
@@ -129,7 +129,8 @@
             else {
                # The Connect command may or may not be followed by 'on'.
                # When it is, 'on' may or may not be followed by a database.
-               my ($user, undef, $db) = $arg =~ /(\S+)/g;
+               my ($user) = $arg =~ m/(\S+)/;
+               my ($db)   = $arg =~ m/on (\S+)/;
                my $host;
                ($user, $host) = split(/@/, $user);
                PTDEBUG && _d('Connect', $user, '@', $host, 'on', $db);

=== modified file 't/lib/GeneralLogParser.t'
--- t/lib/GeneralLogParser.t	2012-03-06 13:56:08 +0000
+++ t/lib/GeneralLogParser.t	2012-12-10 23:39:22 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 7;
+use Test::More;
 
 use GeneralLogParser;
 use PerconaTest;
@@ -219,7 +219,58 @@
    ]
 );
 
+# Customer issue from Ernie.
+test_log_parser(
+   parser  => $p,
+   file    => $sample.'genlog004.txt',
+   oktorun => sub { $oktorun = $_[0]; },
+   result  => [
+      {
+         Query_time => 0,
+         Thread_id => '12345',
+         arg => q/administrator command: Access denied for user 'nobody'@'localhost' (using password: NO)
+/,
+         bytes => 88,
+         cmd => 'Admin',
+         pos_in_log => 0,
+         ts => undef
+      },
+      {
+         Query_time => 0,
+         Thread_id => '12345',
+         arg => 'administrator command: Connect',
+         bytes => 30,
+         cmd => 'Admin',
+         host => 'localhost',
+         pos_in_log => 81,
+         ts => undef,
+         user => 'nobody'
+      },
+      {
+         Query_time => 0,
+         Thread_id => '31519',
+         arg => 'BEGIN',
+         bytes => 5,
+         cmd => 'Query',
+         pos_in_log => 122,
+         ts => undef
+      },
+      {
+         Query_time => 0,
+         Thread_id => '98765',
+         arg => 'administrator command: Connect',
+         bytes => 30,
+         cmd => 'Admin',
+         db => 'sar',
+         host => '1.2.3.4',
+         pos_in_log => 184,
+         ts => undef,
+         user => 'payments_r'
+      },
+   ],
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
-exit;
+done_testing;

=== added file 't/lib/samples/genlogs/genlog004.txt'
--- t/lib/samples/genlogs/genlog004.txt	1970-01-01 00:00:00 +0000
+++ t/lib/samples/genlogs/genlog004.txt	2012-12-10 23:39:22 +0000
@@ -0,0 +1,4 @@
+		12345 Connect	Access denied for user 'nobody'@'localhost' (using password: NO)
+		12345 Connect	nobody@localhost as  on 
+		31519 Query	BEGIN
+		98765 Connect	payments_r@1.2.3.4 on sar