percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

SlowLogParser leaved host empty when --skip-name-resolve was on. Now uses IP if empty - 1262456

Browse Source
This commit is contained in:
Frank Cizmich
2014-09-08 19:00:40 -03:00
parent f0a0a8f737
commit 5e3eaa6c73
19 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Percona/Test.pm
View File

@@ -541,7 +541,7 @@ sub no_diff {
`cat $expected_output | sed $sed_args > /tmp/pt-test-outfile-trf`;
$expected_output = "/tmp/pt-test-outfile-trf";
}
die("entre");
# Determine cmd type and run it.
if ( ref $cmd eq 'CODE' ) {
output($cmd, file => $tmp_file);

2
lib/SlowLogParser.pm
View File

@@ -162,6 +162,7 @@ sub parse_event {
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
$host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
# 5.6 has the thread id on the User@Host line
if ( $thread_id ) {
@@ -177,6 +178,7 @@ sub parse_event {
&& ( my ( $user, $host, $ip, $thread_id ) = $line =~ m/$slow_log_uh_line/o )
) {
PTDEBUG && _d("Got user, host, ip", $user, $host, $ip);
$host ||= $ip; # sometimes host is missing when using skip-name-resolve (LP #issue 1262456)
push @properties, 'user', $user, 'host', $host, 'ip', $ip;
# 5.6 has the thread id on the User@Host line
if ( $thread_id ) {