Remove other instance of 'none' Error_no in MySQLProtocolParser.pm.

This commit is contained in:
Daniel Nichter
2013-02-01 10:41:36 -07:00
parent cf74cd791e
commit 4840b9c3a8
3 changed files with 20 additions and 67 deletions

View File

@@ -3388,11 +3388,13 @@ sub _packet_from_server {
}
$event = {
cmd => $com,
arg => $arg,
ts => $packet->{ts},
Error_no => $error->{errno} ? "#$error->{errno}" : 'none',
cmd => $com,
arg => $arg,
ts => $packet->{ts},
};
if ( $error->{errno} ) {
$event->{Error_no} = $error->{errno};
}
$session->{attribs}->{Error_msg} = $error->{message};
return $self->_make_event($event, $packet, $session);
}
@@ -3603,13 +3605,17 @@ sub _make_event {
Thread_id => $session->{thread_id},
pos_in_log => $session->{pos_in_log},
Query_time => timestamp_diff($session->{ts}, $packet->{ts}),
Error_no => $event->{Error_no} || 'none',
Rows_affected => ($event->{Rows_affected} || 0),
Warning_count => ($event->{Warning_count} || 0),
No_good_index_used => ($event->{No_good_index_used} ? 'Yes' : 'No'),
No_index_used => ($event->{No_index_used} ? 'Yes' : 'No'),
};
@{$new_event}{keys %{$session->{attribs}}} = values %{$session->{attribs}};
foreach my $opt_attrib ( qw(Error_no) ) {
if ( defined $event->{$opt_attrib} ) {
$new_event->{$opt_attrib} = $event->{$opt_attrib};
}
}
PTDEBUG && _d('Properties of event:', Dumper($new_event));
delete $session->{cmd};
@@ -14591,7 +14597,6 @@ sub main {
Last_errno => 'string',
Thread_id => 'string',
InnoDB_trx_id => 'string',
Error_no => 'string',
Killed => 'bool',
};