From 1accb78055723451c7460d4601c901bfccab01a3 Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Mon, 13 Jun 2016 17:29:24 -0300 Subject: [PATCH] Fixed error introduced in MySQLProtocolParser When originally moved the fix out of the pt-query-digest into MySQLProtocolParser I made a mistake and I've introduced an error. Fixed. --- bin/pt-query-digest | 2 +- bin/pt-upgrade | 2 +- lib/MySQLProtocolParser.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/pt-query-digest b/bin/pt-query-digest index 84bde089..3516eb6c 100755 --- a/bin/pt-query-digest +++ b/bin/pt-query-digest @@ -4710,7 +4710,7 @@ sub parse_client_handshake_packet { my ( $db ) = $data =~ m! ^.{64}${user}00.. # Everything matched before (?:..){$code_len} # The scramble buffer - (.*)00.*\Z # The database name + (.*?)00.*\Z # The database name !x; my $pkt = { user => to_string($user), diff --git a/bin/pt-upgrade b/bin/pt-upgrade index da6edda9..29e45186 100755 --- a/bin/pt-upgrade +++ b/bin/pt-upgrade @@ -8722,7 +8722,7 @@ sub parse_client_handshake_packet { my ( $db ) = $data =~ m! ^.{64}${user}00.. # Everything matched before (?:..){$code_len} # The scramble buffer - (.*)00.*\Z # The database name + (.*?)00.*\Z # The database name !x; my $pkt = { user => to_string($user), diff --git a/lib/MySQLProtocolParser.pm b/lib/MySQLProtocolParser.pm index e0140b3d..3e3ac41e 100644 --- a/lib/MySQLProtocolParser.pm +++ b/lib/MySQLProtocolParser.pm @@ -1223,7 +1223,7 @@ sub parse_client_handshake_packet { my ( $db ) = $data =~ m! ^.{64}${user}00.. # Everything matched before (?:..){$code_len} # The scramble buffer - (.*)00.*\Z # The database name + (.*?)00.*\Z # The database name !x; my $pkt = { user => to_string($user),