Merge lp:~percona-toolkit-dev/percona-toolkit/pt-deadlock-logger-introduces-a-noise-to-mysql-1258135 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.9

[Frank Cizmich]

Avoids attempting unnecessary duplicate inserts in deadlock table.

=== modified file 'bin/pt-deadlock-logger'
--- bin/pt-deadlock-logger	2014-06-05 07:24:48 +0000
+++ bin/pt-deadlock-logger	2014-07-03 14:15:20 +0000
@@ -4616,43 +4616,44 @@
          }
       }
       else {
-         if ( $ins_sth ) {
-            eval {
-               PTDEBUG && _d('Saving deadlock to --dest');
-               foreach my $txn (
-                  sort { $a->{thread} <=> $b->{thread} } values %txns
-               ) {
-                  $ins_sth->execute(@{$txn}{@cols});
-               }
-               $dst->dbh->commit();
-            };
-            if ( my $e = $EVAL_ERROR ) {
-               PTDEBUG && _d('Error saving to --dest:', $e);
-               if ( $dst->lost_connection($e) ) {
-                  eval {
-                     $ins_sth->finish() if $ins_sth;
-                     $dst->dbh->disconnect() if $dst->dbh;
-                     $dst->connect(AutoCommit => 0);
-                     $ins_sth = $dst->dbh->prepare($ins_sql);
-                  }; 
-                  if ( $EVAL_ERROR ) {
-                     warn "Lost connection to " . $dst->name . ".  Will try "
-                        . "to reconnect in the next iteration.\n";
-                  }
-                  else {
-                     PTDEBUG && _d('Reconnected to MySQL (--dest)');
-                     redo ITERATION;
-                  }
-               }
-               else {
-                  warn "Error saving to --dest: $EVAL_ERROR";
-                  $exit_status |= 1;
-               }
-            }
-         }
-
          if ( $fingerprint ne $last_fingerprint ) {
             PTDEBUG && _d('New deadlock');
+
+            if ( $ins_sth ) {
+               eval {
+                  PTDEBUG && _d('Saving deadlock to --dest');
+                  foreach my $txn (
+                     sort { $a->{thread} <=> $b->{thread} } values %txns
+                  ) {
+                     $ins_sth->execute(@{$txn}{@cols});
+                  }
+                  $dst->dbh->commit();
+               };
+               if ( my $e = $EVAL_ERROR ) {
+                  PTDEBUG && _d('Error saving to --dest:', $e);
+                  if ( $dst->lost_connection($e) ) {
+                     eval {
+                        $ins_sth->finish() if $ins_sth;
+                        $dst->dbh->disconnect() if $dst->dbh;
+                        $dst->connect(AutoCommit => 0);
+                        $ins_sth = $dst->dbh->prepare($ins_sql);
+                     }; 
+                     if ( $EVAL_ERROR ) {
+                        warn "Lost connection to " . $dst->name . ".  Will try "
+                           . "to reconnect in the next iteration.\n";
+                     }
+                     else {
+                        PTDEBUG && _d('Reconnected to MySQL (--dest)');
+                        redo ITERATION;
+                     }
+                  }
+                  else {
+                     warn "Error saving to --dest: $EVAL_ERROR";
+                     $exit_status |= 1;
+                  }
+               }
+            }
+
             if ( !$o->get('quiet') ) {
                print join($sep, @cols), "\n";
                foreach my $txn (