Automerge

17 years ago · 4223fa0e1e
18 changed files with 136529 additions and 136400 deletions
--- a/mysql-test/extra/binlog_tests/innodb_stat.test
+++ b/mysql-test/extra/binlog_tests/innodb_stat.test
@ -7,6 +7,7 @@
 # Actually this test has nothing to do with innodb per se, it just requires
 # transactional table. 
 #
+flush status;
 show status like "binlog_cache_use";
 show status like "binlog_cache_disk_use";
 --disable_warnings
@ -38,13 +39,3 @@ commit;
 show status like "binlog_cache_use";
 show status like "binlog_cache_disk_use";
 drop table t1;
-
-# Test for testable InnoDB status variables. This test
-# uses previous ones(pages_created, rows_deleted, ...).
-- replace_regex /51[12]/51_/
-show status like "Innodb_buffer_pool_pages_total";
-show status like "Innodb_page_size";
-show status like "Innodb_rows_deleted";
-show status like "Innodb_rows_inserted";
-show status like "Innodb_rows_updated";
-
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@ -433,41 +433,51 @@ sub optimize_cases {
    # Skip processing if already marked as skipped
    next if $tinfo->{skip};

-    # Replication test needs an adjustment of binlog format
-    if (mtr_match_prefix($tinfo->{'name'}, "rpl"))
+    # =======================================================
+    # If a special binlog format was selected with
+    # --mysqld=--binlog-format=x, skip all test that does not
+    # support it
+    # =======================================================
+    #print "used_binlog_format: $::used_binlog_format\n";
+    if (defined $::used_binlog_format )
    {
-
      # =======================================================
-      # Get binlog-format used by this test from master_opt
+      # Fixed --binlog-format=x specified on command line
      # =======================================================
-      my $test_binlog_format;
-      foreach my $opt ( @{$tinfo->{master_opt}} ) {
-	$test_binlog_format= $test_binlog_format ||
-	  mtr_match_prefix($opt, "--binlog-format=");
-      }
-      # print $tinfo->{name}." uses ".$test_binlog_format."\n";
+      if ( defined $tinfo->{'binlog_formats'} )
+      {
+	#print "binlog_formats: ". join(", ", @{$tinfo->{binlog_formats}})."\n";

+	# The test supports different binlog formats
+	# check if the selected one is ok
+	my $supported=
+	  grep { $_ eq $::used_binlog_format } @{$tinfo->{'binlog_formats'}};
+	if ( !$supported )
+	{
+	  $tinfo->{'skip'}= 1;
+	  $tinfo->{'comment'}=
+	    "Doesn't support --binlog-format='$::used_binlog_format'";
+	}
+      }
+    }
+    else
+    {
      # =======================================================
-      # If a special binlog format was selected with
-      # --mysqld=--binlog-format=x, skip all test with different
-      # binlog-format
+      # Use dynamic switching of binlog format
      # =======================================================
-      if (defined $::used_binlog_format and
-	  $test_binlog_format and
-	  $::used_binlog_format ne $test_binlog_format)
-      {
-	$tinfo->{'skip'}= 1;
-	$tinfo->{'comment'}= "Requires --binlog-format='$test_binlog_format'";
-	next;
+
+      # Get binlog-format used by this test from master_opt
+      my $test_binlog_format;
+      foreach my $opt ( @{$tinfo->{master_opt}} ) {
+	$test_binlog_format=
+	  mtr_match_prefix($opt, "--binlog-format=") || $test_binlog_format;
      }

-      # =======================================================
-      # Check that testcase supports the designated binlog-format
-      # =======================================================
-      if ($test_binlog_format and defined $tinfo->{'sup_binlog_formats'} )
+      if (defined $test_binlog_format and
+	  defined $tinfo->{binlog_formats} )
      {
 	my $supported=
-	  grep { $_ eq $test_binlog_format } @{$tinfo->{'sup_binlog_formats'}};
+	  grep { $_ eq $test_binlog_format } @{$tinfo->{'binlog_formats'}};
 	if ( !$supported )
 	{
 	  $tinfo->{'skip'}= 1;
@ -476,20 +486,8 @@ sub optimize_cases {
 	  next;
 	}
      }
-
-      # =======================================================
-      # Use dynamic switching of binlog-format if mtr started
-      # w/o --mysqld=--binlog-format=xxx and combinations.
-      # =======================================================
-      if (!defined $tinfo->{'combination'} and
-          !defined $::used_binlog_format)
-      {
-        $test_binlog_format= $tinfo->{'sup_binlog_formats'}->[0];
-      }
-
-      # Save binlog format for dynamic switching
-      $tinfo->{binlog_format}= $test_binlog_format;
    }
+
  }
 }

@ -879,18 +877,19 @@ sub collect_one_test_case($$$$$$$$$) {
 # the specified value in "tinfo"
 our @tags=
 (
- ["include/have_innodb.inc", "innodb_test", 1],
- ["include/have_binlog_format_row.inc", "sup_binlog_formats", ["row"]],
- ["include/have_log_bin.inc", "need_binlog", 1],
- ["include/have_binlog_format_statement.inc",
-  "sup_binlog_formats", ["statement"]],
- ["include/have_binlog_format_mixed.inc", "sup_binlog_formats", ["mixed"]],
+
+ ["include/have_binlog_format_row.inc", "binlog_formats", ["row"]],
+ ["include/have_binlog_format_statement.inc", "binlog_formats", ["statement"]],
+ ["include/have_binlog_format_mixed.inc", "binlog_formats", ["mixed"]],
 ["include/have_binlog_format_mixed_or_row.inc",
-  "sup_binlog_formats", ["mixed","row"]],
+  "binlog_formats", ["mixed", "row"]],
 ["include/have_binlog_format_mixed_or_statement.inc",
-  "sup_binlog_formats", ["mixed","statement"]],
+  "binlog_formats", ["mixed", "statement"]],
 ["include/have_binlog_format_row_or_statement.inc",
-  "sup_binlog_formats", ["row","statement"]],
+  "binlog_formats", ["row", "statement"]],
+
+ ["include/have_innodb.inc", "innodb_test", 1],
+ ["include/have_log_bin.inc", "need_binlog", 1],
 ["include/big_test.inc", "big_test", 1],
 ["include/have_debug.inc", "need_debug", 1],
 ["include/have_ndb.inc", "ndb_test", 1],
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@ -4357,19 +4357,10 @@ sub run_testcase_need_master_restart($)
  elsif (! mtr_same_opts($master->[0]->{'start_opts'},
                         $tinfo->{'master_opt'}) )
  {
-    # Chech that diff is binlog format only
-    my $diff_opts= mtr_diff_opts($master->[0]->{'start_opts'},$tinfo->{'master_opt'});
-    if (scalar(@$diff_opts) eq 2) 
-    {
-      $do_restart= 1 unless ($diff_opts->[0] =~/^--binlog-format=/ and $diff_opts->[1] =~/^--binlog-format=/);
-    }
-    else
-    {
-      $do_restart= 1;
-      mtr_verbose("Restart master: running with different options '" .
-	         join(" ", @{$tinfo->{'master_opt'}}) . "' != '" .
+    $do_restart= 1;
+    mtr_verbose("Restart master: running with different options '" .
+		join(" ", @{$tinfo->{'master_opt'}}) . "' != '" .
 	  	join(" ", @{$master->[0]->{'start_opts'}}) . "'" );
-    }
  }
  elsif( ! $master->[0]->{'pid'} )
  {
--- a/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
+++ b/mysql-test/suite/binlog/r/binlog_mix_innodb_stat.result
@ -1,3 +1,4 @@
+flush status;
 show status like "binlog_cache_use";
 Variable_name	Value
 Binlog_cache_use	0
@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
 drop table t1;
-show status like "Innodb_buffer_pool_pages_total";
-Variable_name	Value
-Innodb_buffer_pool_pages_total	51_
-show status like "Innodb_page_size";
-Variable_name	Value
-Innodb_page_size	16384
-show status like "Innodb_rows_deleted";
-Variable_name	Value
-Innodb_rows_deleted	2000
-show status like "Innodb_rows_inserted";
-Variable_name	Value
-Innodb_rows_inserted	2000
-show status like "Innodb_rows_updated";
-Variable_name	Value
-Innodb_rows_updated	0
--- a/mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
+++ b/mysql-test/suite/binlog/r/binlog_row_innodb_stat.result
@ -1,3 +1,4 @@
+flush status;
 show status like "binlog_cache_use";
 Variable_name	Value
 Binlog_cache_use	0
@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
 drop table t1;
-show status like "Innodb_buffer_pool_pages_total";
-Variable_name	Value
-Innodb_buffer_pool_pages_total	51_
-show status like "Innodb_page_size";
-Variable_name	Value
-Innodb_page_size	16384
-show status like "Innodb_rows_deleted";
-Variable_name	Value
-Innodb_rows_deleted	2000
-show status like "Innodb_rows_inserted";
-Variable_name	Value
-Innodb_rows_inserted	2000
-show status like "Innodb_rows_updated";
-Variable_name	Value
-Innodb_rows_updated	0
--- a/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
+++ b/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result
@ -1,3 +1,4 @@
+flush status;
 show status like "binlog_cache_use";
 Variable_name	Value
 Binlog_cache_use	0
@ -22,18 +23,3 @@ show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
 drop table t1;
-show status like "Innodb_buffer_pool_pages_total";
-Variable_name	Value
-Innodb_buffer_pool_pages_total	51_
-show status like "Innodb_page_size";
-Variable_name	Value
-Innodb_page_size	16384
-show status like "Innodb_rows_deleted";
-Variable_name	Value
-Innodb_rows_deleted	2000
-show status like "Innodb_rows_inserted";
-Variable_name	Value
-Innodb_rows_inserted	2000
-show status like "Innodb_rows_updated";
-Variable_name	Value
-Innodb_rows_updated	0
--- a/mysql-test/suite/parts/inc/partition_alter2_1.inc
+++ b/mysql-test/suite/parts/inc/partition_alter2_1.inc
@ -1,16 +1,17 @@
 ################################################################################
-# inc/partition_alter2.inc                                                     #
+# inc/partition_alter2_1.inc                                                   #
 #                                                                              #
 # Purpose:                                                                     #
 #   Tests where the columns used within the partitioning function are altered. #
 #   This routine is only useful for the partition_<feature>_<engine> tests.   .#
+#   Part 1: increasing size of column
 #                                                                              #
 #------------------------------------------------------------------------------#
 # Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
-# Change Author:                                                               #
-# Change Date:                                                                 #
-# Change:                                                                      #
+# Change Author: MattiasJ                                                      #
+# Change Date: 2008-09-08                                                      #
+# Change: Splitted the test in two different parts (increasing/decreasing col) #
 ################################################################################

 --echo
@ -140,133 +141,6 @@ let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
 --source suite/parts/inc/partition_alter_11.inc
 --source suite/parts/inc/partition_alter_13.inc

--echo
--echo #========================================================================
--echo #  2     Decrease the size of the column used in the partitioning
--echo #        function and/or PRIMARY KEY and/or UNIQUE INDEX
--echo #========================================================================
--echo #------------------------------------------------------------------------
--echo #  2.1   ALTER column f_int2 not used in partitioning function
--echo #------------------------------------------------------------------------
-#         Rule: Only f_int1 is used within the partitioning function
-#         ---> inc/partition_alter_11.inc
-let $alter= ALTER TABLE t1 MODIFY f_int2 MEDIUMINT;
--echo #  2.1.1 no PRIMARY KEY or UNIQUE INDEX exists
-let $unique= ;
--source suite/parts/inc/partition_alter_11.inc
-#
-if ($do_pk_tests)
-{
-   # The value of the direct following test is maybe covered by the test with
-   # the PRIMARY KEY containing two columns.
-   if ($more_pk_ui_tests)
-   {
-      --echo #  2.1.2 PRIMARY KEY exists
-      let $unique= , PRIMARY KEY (f_int1);
-      --source suite/parts/inc/partition_alter_11.inc
-   }
-   let $unique= , PRIMARY KEY (f_int1,f_int2);
-   --source suite/parts/inc/partition_alter_11.inc
-   let $unique= , PRIMARY KEY (f_int2,f_int1);
-   --source suite/parts/inc/partition_alter_11.inc
-}
-#
--echo #  2.1.3 UNIQUE INDEX exists
-# The value of the direct following test is maybe covered by the test with
-# the UNIQUE INDEX containing two columns.
-if ($more_pk_ui_tests)
-{
-   let $unique= , UNIQUE INDEX uidx1 (f_int1);
-   --source suite/parts/inc/partition_alter_11.inc
-}
-let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
--source suite/parts/inc/partition_alter_11.inc
-let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
--source suite/parts/inc/partition_alter_11.inc
-#
-if ($more_pk_ui_tests)
-{
-   # The value of the tests 2.2 is maybe covered by the tests 2.3
-   --echo #------------------------------------------------------------------------
-   --echo #  2.2   ALTER column f_int1 used in partitioning function
-   --echo #------------------------------------------------------------------------
-   #         Rule: Only f_int1 is used within the partitioning function
-   #         ---> inc/partition_alter_11.inc
-   let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT;
-   --echo #  2.2.1 no PRIMARY KEY or UNIQUE INDEX exists
-   let $unique= ;
-   --source suite/parts/inc/partition_alter_11.inc
-   --source suite/parts/inc/partition_alter_13.inc
-   #
-   if ($do_pk_tests)
-   {
-      --echo #  2.2.2 PRIMARY KEY exists
-      let $unique= , PRIMARY KEY (f_int1);
-      --source suite/parts/inc/partition_alter_11.inc
-      let $unique= , PRIMARY KEY (f_int1,f_int2);
-      --source suite/parts/inc/partition_alter_11.inc
-      --source suite/parts/inc/partition_alter_13.inc
-      let $unique= , PRIMARY KEY (f_int2,f_int1);
-      --source suite/parts/inc/partition_alter_11.inc
-      --source suite/parts/inc/partition_alter_13.inc
-   }
-   #
-   --echo #  2.2.3 UNIQUE INDEX exists
-   let $unique= , UNIQUE INDEX uidx (f_int1);
-   --source suite/parts/inc/partition_alter_11.inc
-   let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
-   --source suite/parts/inc/partition_alter_11.inc
-   --source suite/parts/inc/partition_alter_13.inc
-   let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
-   --source suite/parts/inc/partition_alter_11.inc
-   --source suite/parts/inc/partition_alter_13.inc
-}
-#
--echo #------------------------------------------------------------------------
--echo #  2.3   ALTER column f_int1 and f_int2 used in partitioning function
--echo #------------------------------------------------------------------------
-#         Rule: f_int1 and f_int2 is used within the partitioning function
-#         ---> inc/partition_alter_13.inc
-let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT, MODIFY f_int2 MEDIUMINT;
--echo #  2.3.1 no PRIMARY KEY or UNIQUE INDEX exists
-let $unique= ;
--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc
-#
-if ($do_pk_tests)
-{
-   --echo #  2.3.2 PRIMARY KEY exists
-   # The value of the direct following test is maybe covered by the test with
-   # the PRIMARY KEY containing two columns.
-   if ($more_pk_ui_tests)
-   {
-      let $unique= , PRIMARY KEY (f_int1);
-      --source suite/parts/inc/partition_alter_11.inc
-   }
-   let $unique= , PRIMARY KEY (f_int1,f_int2);
-   --source suite/parts/inc/partition_alter_11.inc
-   --source suite/parts/inc/partition_alter_13.inc
-   let $unique= , PRIMARY KEY (f_int2,f_int1);
-   --source suite/parts/inc/partition_alter_11.inc
-   --source suite/parts/inc/partition_alter_13.inc
-}
-#
--echo #  2.3.3 UNIQUE INDEX exists
-# The value of the direct following test is maybe covered by the test with
-# the UNIQUE INDEX containing two columns.
-if ($more_pk_ui_tests)
-{
-   let $unique= , UNIQUE INDEX uidx (f_int1);
-   --source suite/parts/inc/partition_alter_11.inc
-}
-let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc
-let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
--source suite/parts/inc/partition_alter_11.inc
--source suite/parts/inc/partition_alter_13.inc
-#
-
 if (0)
 {
 --echo
--- a/mysql-test/suite/parts/inc/partition_alter2_2.inc
+++ b/mysql-test/suite/parts/inc/partition_alter2_2.inc
@ -0,0 +1,159 @@
+################################################################################
+# inc/partition_alter2_2.inc                                                   #
+#                                                                              #
+# Purpose:                                                                     #
+#   Tests where the columns used within the partitioning function are altered. #
+#   This routine is only useful for the partition_<feature>_<engine> tests.   .#
+#   Part 2: decreasing size of column
+#                                                                              #
+#------------------------------------------------------------------------------#
+# Original Author: mleich                                                      #
+# Original Date: 2006-03-05                                                    #
+# Change Author: MattiasJ                                                      #
+# Change Date: 2008-09-08                                                      #
+# Change: Splitted the test in two different parts (increasing/decreasing col) #
+################################################################################
+
+--echo
+--echo #========================================================================
+--echo #  2     Decrease the size of the column used in the partitioning
+--echo #        function and/or PRIMARY KEY and/or UNIQUE INDEX
+--echo #========================================================================
+--echo #------------------------------------------------------------------------
+--echo #  2.1   ALTER column f_int2 not used in partitioning function
+--echo #------------------------------------------------------------------------
+#         Rule: Only f_int1 is used within the partitioning function
+#         ---> inc/partition_alter_11.inc
+let $alter= ALTER TABLE t1 MODIFY f_int2 MEDIUMINT;
+--echo #  2.1.1 no PRIMARY KEY or UNIQUE INDEX exists
+let $unique= ;
+--source suite/parts/inc/partition_alter_11.inc
+#
+if ($do_pk_tests)
+{
+   # The value of the direct following test is maybe covered by the test with
+   # the PRIMARY KEY containing two columns.
+   if ($more_pk_ui_tests)
+   {
+      --echo #  2.1.2 PRIMARY KEY exists
+      let $unique= , PRIMARY KEY (f_int1);
+      --source suite/parts/inc/partition_alter_11.inc
+   }
+   let $unique= , PRIMARY KEY (f_int1,f_int2);
+   --source suite/parts/inc/partition_alter_11.inc
+   let $unique= , PRIMARY KEY (f_int2,f_int1);
+   --source suite/parts/inc/partition_alter_11.inc
+}
+#
+--echo #  2.1.3 UNIQUE INDEX exists
+# The value of the direct following test is maybe covered by the test with
+# the UNIQUE INDEX containing two columns.
+if ($more_pk_ui_tests)
+{
+   let $unique= , UNIQUE INDEX uidx1 (f_int1);
+   --source suite/parts/inc/partition_alter_11.inc
+}
+let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
+--source suite/parts/inc/partition_alter_11.inc
+let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
+--source suite/parts/inc/partition_alter_11.inc
+#
+if ($more_pk_ui_tests)
+{
+   # The value of the tests 2.2 is maybe covered by the tests 2.3
+   --echo #------------------------------------------------------------------------
+   --echo #  2.2   ALTER column f_int1 used in partitioning function
+   --echo #------------------------------------------------------------------------
+   #         Rule: Only f_int1 is used within the partitioning function
+   #         ---> inc/partition_alter_11.inc
+   let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT;
+   --echo #  2.2.1 no PRIMARY KEY or UNIQUE INDEX exists
+   let $unique= ;
+   --source suite/parts/inc/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_13.inc
+   #
+   if ($do_pk_tests)
+   {
+      --echo #  2.2.2 PRIMARY KEY exists
+      let $unique= , PRIMARY KEY (f_int1);
+      --source suite/parts/inc/partition_alter_11.inc
+      let $unique= , PRIMARY KEY (f_int1,f_int2);
+      --source suite/parts/inc/partition_alter_11.inc
+      --source suite/parts/inc/partition_alter_13.inc
+      let $unique= , PRIMARY KEY (f_int2,f_int1);
+      --source suite/parts/inc/partition_alter_11.inc
+      --source suite/parts/inc/partition_alter_13.inc
+   }
+   #
+   --echo #  2.2.3 UNIQUE INDEX exists
+   let $unique= , UNIQUE INDEX uidx (f_int1);
+   --source suite/parts/inc/partition_alter_11.inc
+   let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
+   --source suite/parts/inc/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_13.inc
+   let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
+   --source suite/parts/inc/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_13.inc
+}
+#
+--echo #------------------------------------------------------------------------
+--echo #  2.3   ALTER column f_int1 and f_int2 used in partitioning function
+--echo #------------------------------------------------------------------------
+#         Rule: f_int1 and f_int2 is used within the partitioning function
+#         ---> inc/partition_alter_13.inc
+let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT, MODIFY f_int2 MEDIUMINT;
+--echo #  2.3.1 no PRIMARY KEY or UNIQUE INDEX exists
+let $unique= ;
+--source suite/parts/inc/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_13.inc
+#
+if ($do_pk_tests)
+{
+   --echo #  2.3.2 PRIMARY KEY exists
+   # The value of the direct following test is maybe covered by the test with
+   # the PRIMARY KEY containing two columns.
+   if ($more_pk_ui_tests)
+   {
+      let $unique= , PRIMARY KEY (f_int1);
+      --source suite/parts/inc/partition_alter_11.inc
+   }
+   let $unique= , PRIMARY KEY (f_int1,f_int2);
+   --source suite/parts/inc/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_13.inc
+   let $unique= , PRIMARY KEY (f_int2,f_int1);
+   --source suite/parts/inc/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_13.inc
+}
+#
+--echo #  2.3.3 UNIQUE INDEX exists
+# The value of the direct following test is maybe covered by the test with
+# the UNIQUE INDEX containing two columns.
+if ($more_pk_ui_tests)
+{
+   let $unique= , UNIQUE INDEX uidx (f_int1);
+   --source suite/parts/inc/partition_alter_11.inc
+}
+let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
+--source suite/parts/inc/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_13.inc
+let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
+--source suite/parts/inc/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_13.inc
+#
+
+if (0)
+{
+--echo
+--echo #========================================================================
+--echo #  3     ALTER the type of the column used in the partitioning
+--echo #        function and/or PRIMARY KEY and/or UNIQUE INDEX
+--echo #                   INTEGER --> FLOAT
+--echo #                   INTEGER --> DECIMAL
+--echo #                   INTEGER --> VARCHAR
+--echo #        mleich: I assume that at least the first two variants are of
+--echo #            some interest. But I am unsure if the server allows such
+--echo #            conversions. I also think that such operations have a
+--echo #            conversions very small likelihood.
+--echo #            To be implemented.
+--echo #========================================================================
+}
--- a/mysql-test/suite/parts/r/partition_alter2_1_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter2_1_innodb.result
--- a/mysql-test/suite/parts/r/partition_alter2_1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_1_myisam.result
--- a/mysql-test/suite/parts/r/partition_alter2_2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter2_2_innodb.result
--- a/mysql-test/suite/parts/r/partition_alter2_2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_2_myisam.result
--- a/mysql-test/suite/parts/r/partition_alter2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter2_innodb.result
--- a/mysql-test/suite/parts/t/disabled.def
+++ b/mysql-test/suite/parts/t/disabled.def
@ -1,4 +1,3 @@
-partition_alter2_ndb           : Bug#18735 Not supported
 partition_basic_ndb            : Bug#19899 Crashing the server
 # http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-limitations-syntax.html
 partition_bit_ndb              : NDB does not support bit column in index
--- a/mysql-test/suite/parts/t/partition_alter2_1_innodb.test
+++ b/mysql-test/suite/parts/t/partition_alter2_1_innodb.test
@ -1,5 +1,5 @@
 ################################################################################
-# t/partition_alter2_innodb.test                                               #
+# t/partition_alter2_1_innodb.test                                             #
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests around Alter column used in partitioning function                     #
@ -70,7 +70,7 @@ let $MAX_VALUE= (2147483646);

 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
--source suite/parts/inc/partition_alter2.inc
+--source suite/parts/inc/partition_alter2_1.inc

 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
--- a/mysql-test/suite/parts/t/partition_alter2_1_myisam.test
+++ b/mysql-test/suite/parts/t/partition_alter2_1_myisam.test
@ -1,5 +1,5 @@
 ################################################################################
-# t/partition_alter2_myisam.test                                               #
+# t/partition_alter2_1_myisam.test                                             #
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests around Alter column used in partitioning function                     #
@ -69,7 +69,7 @@ let $MAX_VALUE= (2147483646);

 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
--source suite/parts/inc/partition_alter2.inc
+--source suite/parts/inc/partition_alter2_1.inc

 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
--- a/mysql-test/suite/parts/t/partition_alter2_2_innodb.test
+++ b/mysql-test/suite/parts/t/partition_alter2_2_innodb.test
@ -1,9 +1,9 @@
 ################################################################################
-# t/partition_alter2_ndb.test                                                  #
+# t/partition_alter2_2_innodb.test                                             #
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests around Alter column used in partitioning function                     #
-#        NDB branch                                                            #
+#        InnoDB branch                                                         #
 #                                                                              #
 #------------------------------------------------------------------------------#
 # Original Author: mleich                                                      #
@ -14,7 +14,7 @@
 ################################################################################

 #
-# NOTE: PLEASE DO NOT ADD NOT NDB SPECIFIC TESTCASES HERE !
+# NOTE: PLEASE DO NOT ADD NOT INNODB SPECIFIC TESTCASES HERE !
 #       TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
 #       THE SOURCED FILES ONLY.
 #
@ -40,35 +40,26 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;

-# The server must support partitioning. But NDB is partitioned from the start.
-# Thats why the next line is set to comment.
-# --source include/have_partition.inc
+# The server must support partitioning.
+--source include/have_partition.inc

 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements

 ##### Storage engine to be tested
--source include/have_ndb.inc
-let $engine= 'ndbcluster';
-connection default;
-
-# range, list and hash partitioning in ndb requires new_mode
--disable_query_log
-set new=on;
--enable_query_log
+--source include/have_innodb.inc
+let $engine= 'InnoDB';
+
 ##### Execute the test of "table" files
-# NDB has no files per PK, UI, ...
+# InnoDB has no files per PK, UI, ...
 let $do_file_tests= 0;

 ##### Execute PRIMARY KEY tests                                      #####
-# AFAIK NDB is always partitioned using the explicit defined PRIMARY KEY
-#       or uses an internal one.
+# AFAIK InnoDB clusters the table around PRIMARY KEYs.
 let $do_pk_tests= 1;

 ##### Assign a big number smaller than the maximum value for partitions  #####
 #     and smaller than the maximum value of SIGNED INTEGER
-# The NDB handler only supports 32 bit integers in VALUES
-#     2147483647 seems to be too big.
 let $MAX_VALUE= (2147483646);

 # Generate the prerequisites ($variables, @variables, tables) needed
@ -79,7 +70,7 @@ let $MAX_VALUE= (2147483646);

 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
--source suite/parts/inc/partition_alter2.inc
+--source suite/parts/inc/partition_alter2_2.inc

 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
--- a/mysql-test/suite/parts/t/partition_alter2_2_myisam.test
+++ b/mysql-test/suite/parts/t/partition_alter2_2_myisam.test
@ -0,0 +1,79 @@
+################################################################################
+# t/partition_alter2_2_myisam.test                                             #
+#                                                                              #
+# Purpose:                                                                     #
+#  Tests around Alter column used in partitioning function                     #
+#        MyISAM branch                                                         #
+#                                                                              #
+#------------------------------------------------------------------------------#
+# Original Author: mleich                                                      #
+# Original Date: 2006-03-05                                                    #
+# Change Author:                                                               #
+# Change Date:                                                                 #
+# Change:                                                                      #
+################################################################################
+
+#
+# NOTE: PLEASE DO NOT ADD NOT MYISAM SPECIFIC TESTCASES HERE !
+#       TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
+#       THE SOURCED FILES ONLY.
+#
+# Please read the README at the end of inc/partition.pre before changing
+# any of the variables.
+#
+
+#------------------------------------------------------------------------------#
+# General not engine specific settings and requirements
+
+##### Options, for debugging support #####
+let $debug= 0;
+let $with_partitioning= 1;
+
+##### Option, for displaying files #####
+let $ls= 1;
+
+##### Number of rows for the INSERT/UPDATE/DELETE/SELECT experiments #####
+#     on partioned tables
+SET @max_row = 20;
+
+##### Execute more tests                                             #####
+let $more_trigger_tests= 0;
+let $more_pk_ui_tests= 0;
+
+# The server must support partitioning.
+--source include/have_partition.inc
+
+#------------------------------------------------------------------------------#
+# Engine specific settings and requirements
+
+##### Storage engine to be tested
+let $engine= 'MyISAM';
+
+##### Execute the test of "table" files
+# MyISAM has files per PK, UI, ...
+let $do_file_tests= 1;
+
+##### Execute PRIMARY KEY tests                                      #####
+# AFAIK MyISAM treats PRIMARY KEYs like UNIQUE INDEXes
+let $do_pk_tests= 0;
+
+##### Assign a big number smaller than the maximum value for partitions  #####
+#     and smaller than the maximum value of SIGNED INTEGER
+let $MAX_VALUE= (2147483646);
+
+# Generate the prerequisites ($variables, @variables, tables) needed
+--source suite/parts/inc/partition.pre
+
+##### Workarounds for known open engine specific bugs
+#     none
+
+#------------------------------------------------------------------------------#
+# Execute the tests to be applied to all storage engines
+--source suite/parts/inc/partition_alter2_2.inc
+
+#------------------------------------------------------------------------------#
+# Execute storage engine specific tests
+
+#------------------------------------------------------------------------------#
+# Cleanup
+--source suite/parts/inc/partition_cleanup.inc