From 927a3b2ed10ebd605ef112fa754e8d3296f42d5e Mon Sep 17 00:00:00 2001
From: Daniel Nichter <daniel@percona.com>
Date: Wed, 13 Mar 2013 16:54:53 -0600
Subject: [PATCH] Test bug 942377.

---
 t/pt-upgrade/samples/006/dupe_col.log         |  4 +++
 t/pt-upgrade/samples/006/dupe_col.txt         | 35 +++++++++++++++++++
 t/pt-upgrade/samples/006/dupe_col_results.txt | 32 +++++++++++++++++
 .../samples/006/dupe_col_results/query        |  3 ++
 .../samples/006/dupe_col_results/results      |  6 ++++
 .../samples/006/dupe_col_results/rows         |  8 +++++
 t/pt-upgrade/samples/006/tables.sql           | 12 +++++++
 7 files changed, 100 insertions(+)
 create mode 100644 t/pt-upgrade/samples/006/dupe_col.log
 create mode 100644 t/pt-upgrade/samples/006/dupe_col.txt
 create mode 100644 t/pt-upgrade/samples/006/dupe_col_results.txt
 create mode 100644 t/pt-upgrade/samples/006/dupe_col_results/query
 create mode 100644 t/pt-upgrade/samples/006/dupe_col_results/results
 create mode 100644 t/pt-upgrade/samples/006/dupe_col_results/rows
 create mode 100644 t/pt-upgrade/samples/006/tables.sql

diff --git a/t/pt-upgrade/samples/006/dupe_col.log b/t/pt-upgrade/samples/006/dupe_col.log
new file mode 100644
index 00000000..87b1712f
--- /dev/null
+++ b/t/pt-upgrade/samples/006/dupe_col.log
@@ -0,0 +1,4 @@
+# User@Host: root[root] @ localhost []
+# Query_time: 1  Lock_time: 0  Rows_sent: 7  Rows_examined: 7
+use test;
+SELECT city, city FROM t LIMIT 1;
diff --git a/t/pt-upgrade/samples/006/dupe_col.txt b/t/pt-upgrade/samples/006/dupe_col.txt
new file mode 100644
index 00000000..f5995cc5
--- /dev/null
+++ b/t/pt-upgrade/samples/006/dupe_col.txt
@@ -0,0 +1,35 @@
+
+#-----------------------------------------------------------------------
+# Logs
+#-----------------------------------------------------------------------
+
+File: ...
+Size: 145
+
+#-----------------------------------------------------------------------
+# Hosts
+#-----------------------------------------------------------------------
+
+host1:
+
+  DSN:       h=127.1,P=12345
+  hostname:  ...
+  MySQL:     ...
+
+host2:
+
+  DSN:       h=127.1,P=12348
+  hostname:  ...
+  MySQL:     ...
+
+#-----------------------------------------------------------------------
+# Stats
+#-----------------------------------------------------------------------
+
+failed_queries        0
+not_select            0
+queries_filtered      0
+queries_no_diffs      1
+queries_read          1
+queries_with_diffs    0
+queries_with_errors   0
diff --git a/t/pt-upgrade/samples/006/dupe_col_results.txt b/t/pt-upgrade/samples/006/dupe_col_results.txt
new file mode 100644
index 00000000..4ec0a120
--- /dev/null
+++ b/t/pt-upgrade/samples/006/dupe_col_results.txt
@@ -0,0 +1,32 @@
+
+#-----------------------------------------------------------------------
+# Logs
+#-----------------------------------------------------------------------
+
+Results directory: ...
+
+#-----------------------------------------------------------------------
+# Hosts
+#-----------------------------------------------------------------------
+
+host1:
+
+  Reading results from ...
+
+host2:
+
+  DSN:       h=127.1,P=12348
+  hostname:  ...
+  MySQL:     ...
+
+#-----------------------------------------------------------------------
+# Stats
+#-----------------------------------------------------------------------
+
+failed_queries        0
+not_select            0
+queries_filtered      0
+queries_no_diffs      1
+queries_read          1
+queries_with_diffs    0
+queries_with_errors   0
diff --git a/t/pt-upgrade/samples/006/dupe_col_results/query b/t/pt-upgrade/samples/006/dupe_col_results/query
new file mode 100644
index 00000000..ef664b44
--- /dev/null
+++ b/t/pt-upgrade/samples/006/dupe_col_results/query
@@ -0,0 +1,3 @@
+use `test`;
+SELECT city, city FROM t LIMIT 1
+##
diff --git a/t/pt-upgrade/samples/006/dupe_col_results/results b/t/pt-upgrade/samples/006/dupe_col_results/results
new file mode 100644
index 00000000..5f0e9efc
--- /dev/null
+++ b/t/pt-upgrade/samples/006/dupe_col_results/results
@@ -0,0 +1,6 @@
+$results = {
+  query_time => '0',
+  warnings => {}
+};
+
+##
diff --git a/t/pt-upgrade/samples/006/dupe_col_results/rows b/t/pt-upgrade/samples/006/dupe_col_results/rows
new file mode 100644
index 00000000..a9ac6333
--- /dev/null
+++ b/t/pt-upgrade/samples/006/dupe_col_results/rows
@@ -0,0 +1,8 @@
+$rows = [
+  [
+    'aaa',
+    'aaa'
+  ]
+];
+
+##
diff --git a/t/pt-upgrade/samples/006/tables.sql b/t/pt-upgrade/samples/006/tables.sql
new file mode 100644
index 00000000..9ca0f765
--- /dev/null
+++ b/t/pt-upgrade/samples/006/tables.sql
@@ -0,0 +1,12 @@
+DROP DATABASE IF EXISTS test;
+CREATE DATABASE test;
+USE test;
+CREATE TABLE t (
+  id    int(10) NOT NULL AUTO_INCREMENT,
+  city  varchar(8) default NULL,
+  PRIMARY KEY  (`id`)
+);
+INSERT INTO t VALUES
+  (null,  'aaa'),
+  (null,  'bbb'),
+  (null,  'ccc');