From 117e78a3c9ca9e2345ac711a754efea0bd3fc6ab Mon Sep 17 00:00:00 2001
From: Daniel Nichter <daniel@percona.com>
Date: Wed, 17 Oct 2012 12:19:55 -0600
Subject: [PATCH] Tweak tests to recreate the original problem.

---
 t/pt-upgrade/basics.t                    | 4 +++-
 t/pt-upgrade/samples/004/select-func.log | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/t/pt-upgrade/basics.t b/t/pt-upgrade/basics.t
index 68a5dc97..835fe2e4 100644
--- a/t/pt-upgrade/basics.t
+++ b/t/pt-upgrade/basics.t
@@ -196,7 +196,9 @@ $sb->load_file('master1', "$sample/004/tables.sql");
 
 ok(
    no_diff(
-      sub { pt_upgrade::main(@args, "$log/004/select-func.log") },
+      sub { pt_upgrade::main(@args,
+         qw(--compare-results-method rows),
+         "$log/004/select-func.log") },
       "$sample/004/select-func.txt",
    ),
    'SELECT FUNC() (bug 1060774)'
diff --git a/t/pt-upgrade/samples/004/select-func.log b/t/pt-upgrade/samples/004/select-func.log
index b74681cd..94a3bc64 100644
--- a/t/pt-upgrade/samples/004/select-func.log
+++ b/t/pt-upgrade/samples/004/select-func.log
@@ -1,4 +1,4 @@
 # User@Host: root[root] @ localhost []
 # Query_time: 1  Lock_time: 0  Rows_sent: 1  Rows_examined: 1
 use test;
-SELECT (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP('2012-09-16 10:16:36')) / 60;
+SELECT (UNIX_TIMESTAMP(NOW()) - UNIX_TIMESTAMP('2012-09-16 10:16:36')) / 60, SLEEP(1);