Merge lp:~percona-toolkit-dev/percona-toolkit/pt-osc-default-engine into lp:percona-toolkit/2.1

[Daniel Nichter]

Unmerged revisions

=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2012-11-08 23:38:07 +0000
+++ bin/pt-online-schema-change	2012-11-08 23:43:22 +0000
@@ -8585,6 +8585,9 @@
       my $sql    = $ddl;
       $sql       =~ s/\ACREATE TABLE .*?\($/CREATE TABLE $quoted (/m;
       $sql       =~ s/^  CONSTRAINT `/  CONSTRAINT `_/gm;
+      if ( $o->get('default-engine') ) {
+         $sql =~ s/\s+ENGINE=\S+//;
+      }
       PTDEBUG && _d($sql);
       eval {
          $cxn->dbh()->do($sql);
@@ -9752,6 +9755,17 @@
 50 seems likely to be unacceptably high for most servers, indicating that the
 operation should be canceled immediately.
 
+=item --default-engine
+
+Remove C<ENGINE> from the new table.
+
+By default the new table is created with the same table options as
+the original table, so if the original table uses InnoDB, then the new
+table will use InnoDB.  In certain cases involving replication, this may
+cause unintended changes on replicas which use a different engine for
+the same table.  Specifying this option causes the new table to be
+created with the system's default engine.
+
 =item --defaults-file
 
 short form: -F; type: string

=== modified file 't/pt-online-schema-change/basics.t'
--- t/pt-online-schema-change/basics.t	2012-06-09 18:43:33 +0000
+++ t/pt-online-schema-change/basics.t	2012-11-08 23:43:22 +0000
@@ -635,6 +635,31 @@
 );
 
 # #############################################################################
+# --default-engine
+# #############################################################################
+
+SKIP: {
+   skip "--default-engine tests require < MySQL 5.5", 1
+      if $sandbox_version ge '5.5';
+
+   # The alter doesn't actually change the engine (test_type),
+   # but the --default-engine does because the table uses InnoDB
+   # but MyISAM is the default engine before MySQL 5.5.
+   test_alter_table(
+      name       => "--default-engine",
+      table      => "pt_osc.t",
+      file       => "default-engine.sql",
+      test_type  => "new_engine",
+      new_engine => "MyISAM",
+      cmds       => [
+         '--default-engine',
+         '--execute',
+         '--alter', 'ADD INDEX (d)',
+      ],
+   );
+}
+
+# #############################################################################
 # Done.
 # #############################################################################
 $master_dbh->do("UPDATE mysql.proc SET created='2012-06-05 00:00:00', modified='2012-06-05 00:00:00'");

=== added file 't/pt-online-schema-change/samples/default-engine.sql'
--- t/pt-online-schema-change/samples/default-engine.sql	1970-01-01 00:00:00 +0000
+++ t/pt-online-schema-change/samples/default-engine.sql	2012-11-08 23:43:22 +0000
@@ -0,0 +1,20 @@
+DROP DATABASE IF EXISTS pt_osc;
+CREATE DATABASE pt_osc;
+USE pt_osc;
+CREATE TABLE t (
+  id int auto_increment primary key,
+  c  char(32),
+  d  date,
+  unique index (c(32))
+) ENGINE=InnoDB;
+INSERT INTO pt_osc.t VALUES
+   (null, 'a', now()),
+   (null, 'b', now()),
+   (null, 'c', now()),
+   (null, 'd', now()),
+   (null, 'e', now()),
+   (null, 'f', now()),
+   (null, 'g', now()),
+   (null, 'h', now()),
+   (null, 'i', now()),
+   (null, 'j', now()); -- 10