Merge lp:~percona-toolkit-dev/percona-toolkit/fix-1002448 into lp:percona-toolkit/2.1

[Brian Fraser]

[Daniel Nichter (daniel-nichter)]

review: Approve

[Brian Fraser (fraserbn)]

review: Approve

=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2012-05-25 21:27:23 +0000
+++ bin/pt-online-schema-change	2012-05-28 14:41:22 +0000
@@ -6296,7 +6296,7 @@
    # Find a pk or unique index to use for the delete trigger.  can_nibble()
    # above returns an index, but NibbleIterator will use non-unique indexes,
    # so we have to do this again here.
-   my $indexes = $orig_tbl->{tbl_struct}->{indexes}; # brevity
+   my $indexes = $orig_tbl->{tbl_struct}->{keys}; # brevity
    foreach my $index ( $tp->sort_indexes($orig_tbl->{tbl_struct}) ) {
       if ( $index eq 'PRIMARY' || $indexes->{$index}->{is_unique} ) {
          PTDEBUG && _d('Delete trigger index:', Dumper($index));

=== modified file 't/pt-online-schema-change/bugs.t'
--- t/pt-online-schema-change/bugs.t	2012-05-16 16:04:52 +0000
+++ t/pt-online-schema-change/bugs.t	2012-05-28 14:41:22 +0000
@@ -29,7 +29,7 @@
    plan skip_all => 'Cannot connect to sandbox slave1';
 }
 else {
-   plan tests => 2;
+   plan tests => 3;
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -66,6 +66,23 @@
    "Bug 994002: doesn't choose non-PK"
 );
 
+# ############################################################################
+# https://bugs.launchpad.net/percona-toolkit/+bug/1002448
+# ############################################################################
+$sb->load_file('master', "$sample/bug-1002448.sql");
+
+$output = output(
+    sub { pt_online_schema_change::main(@args,
+            "$master_dsn,D=test1002448,t=table_name",
+            "--alter", "add column (foo int)",
+            qw(--chunk-size 2 --dry-run --print)) },
+);
+
+
+unlike $output,
+    qr/\QThe original table `test1002448`.`table_name` does not have a PRIMARY KEY or a unique index which is required for the DELETE trigger/,
+    "Bug 1002448: mistakenly uses indexes instead of keys";
+
 # #############################################################################
 # Done.
 # #############################################################################

=== added file 't/pt-online-schema-change/samples/bug-1002448.sql'
--- t/pt-online-schema-change/samples/bug-1002448.sql	1970-01-01 00:00:00 +0000
+++ t/pt-online-schema-change/samples/bug-1002448.sql	2012-05-28 14:41:22 +0000
@@ -0,0 +1,14 @@
+drop database if exists test1002448;
+create database test1002448;
+use test1002448;
+
+CREATE TABLE `table_name` (
+  `site` varchar(20) NOT NULL DEFAULT '',
+  `update_name` varchar(32) NOT NULL DEFAULT '',
+  `user` varchar(64) NOT NULL DEFAULT '',
+  `time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `value` varchar(64) NOT NULL DEFAULT '',
+  UNIQUE KEY `site` (`site`,`update_name`,`user`,`value`),
+  KEY `user` (`user`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+