Merge lp:~percona-toolkit-dev/percona-toolkit/test-pt-upgrade-2.2-duplicate-col-bug-942377 into lp:percona-toolkit/2.2

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

Just a new test, that passes.

review: Approve

=== added directory 't/pt-upgrade/samples/006'
=== added file 't/pt-upgrade/samples/006/dupe_col.log'
--- t/pt-upgrade/samples/006/dupe_col.log	1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/006/dupe_col.log	2013-03-13 22:57:25 +0000
@@ -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;

=== added file 't/pt-upgrade/samples/006/dupe_col.txt'
--- t/pt-upgrade/samples/006/dupe_col.txt	1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/006/dupe_col.txt	2013-03-13 22:57:25 +0000
@@ -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

=== added directory 't/pt-upgrade/samples/006/dupe_col_results'
=== added file 't/pt-upgrade/samples/006/dupe_col_results.txt'
--- t/pt-upgrade/samples/006/dupe_col_results.txt	1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/006/dupe_col_results.txt	2013-03-13 22:57:25 +0000
@@ -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

=== added file 't/pt-upgrade/samples/006/dupe_col_results/query'
--- t/pt-upgrade/samples/006/dupe_col_results/query	1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/006/dupe_col_results/query	2013-03-13 22:57:25 +0000
@@ -0,0 +1,3 @@
+use `test`;
+SELECT city, city FROM t LIMIT 1
+##

=== added file 't/pt-upgrade/samples/006/dupe_col_results/results'
--- t/pt-upgrade/samples/006/dupe_col_results/results	1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/006/dupe_col_results/results	2013-03-13 22:57:25 +0000
@@ -0,0 +1,6 @@
+$results = {
+  query_time => '0',
+  warnings => {}
+};
+
+##

=== added file 't/pt-upgrade/samples/006/dupe_col_results/rows'
--- t/pt-upgrade/samples/006/dupe_col_results/rows	1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/006/dupe_col_results/rows	2013-03-13 22:57:25 +0000
@@ -0,0 +1,8 @@
+$rows = [
+  [
+    'aaa',
+    'aaa'
+  ]
+];
+
+##

=== added file 't/pt-upgrade/samples/006/tables.sql'
--- t/pt-upgrade/samples/006/tables.sql	1970-01-01 00:00:00 +0000
+++ t/pt-upgrade/samples/006/tables.sql	2013-03-13 22:57:25 +0000
@@ -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');