From 1e082cfd3412eaa3505f5ad97855391732c97fc6 Mon Sep 17 00:00:00 2001
From: Baron Schwartz <baron@xaprb.com>
Date: Sun, 3 Jun 2012 14:47:00 -0400
Subject: [PATCH] fix a couple things for MySQL 5.5

---
 bin/pt-deadlock-logger      |  5 ++++-
 t/pt-deadlock-logger/bugs.t | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index cd6a9a97..48350cf1 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -1987,7 +1987,7 @@ sub main {
             PTDEBUG && _d($sql);
             eval { $dbh_child->do($sql); }; # Should block against parent.
             PTDEBUG && _d($EVAL_ERROR); # Parent inserted value 0.
-            $sql = "DROP TABLE $db_tbl";
+            $sql = "COMMIT";
             PTDEBUG && _d($sql);
             $dbh_child->do($sql);
             exit;
@@ -2001,6 +2001,9 @@ sub main {
          eval { $dbh->do($sql); };
          PTDEBUG && _d($EVAL_ERROR);
          waitpid($pid, 0);
+         $sql = "DROP TABLE $db_tbl";
+         PTDEBUG && _d($sql);
+         $dbh->do($sql);
       }
       
       # If there's an --interval argument, run forever or till specified.
diff --git a/t/pt-deadlock-logger/bugs.t b/t/pt-deadlock-logger/bugs.t
index 4ee463a9..621ec5ce 100644
--- a/t/pt-deadlock-logger/bugs.t
+++ b/t/pt-deadlock-logger/bugs.t
@@ -26,16 +26,16 @@ is_deeply(
    pt_deadlock_logger::parse_deadlocks($innodb_status_sample),
    {
       '1' => {
-          db => '',
+          db => 'test',
           hostname => 'localhost',
           id => 1,
-          idx => '',
+          idx => 'PRIMARY',
           ip => '',
-          lock_mode => '',
-          lock_type => '',
+          lock_mode => 'X',
+          lock_type => 'RECORD',
           query => 'update a set movie_id=96 where id =2',
           server => '',
-          tbl => '',
+          tbl => 'a',
           thread => '19',
           ts => '2011-12-12T22:52:42',
           txn_id => 0,
@@ -45,16 +45,16 @@ is_deeply(
           wait_hold => 'w'
       },
       '2' => {
-          db => '',
+          db => 'test',
           hostname => 'localhost',
           id => 2,
-          idx => '',
+          idx => 'PRIMARY',
           ip => '',
-          lock_mode => '',
-          lock_type => '',
+          lock_mode => 'X',
+          lock_type => 'RECORD',
           query => 'update a set movie_id=98 where id =4',
           server => '',
-          tbl => '',
+          tbl => 'a',
           thread => '18',
           ts => '2011-12-12T22:52:42',
           txn_id => 0,