Merge next-mr -> next-4284.

4 files changed, 170 insertions, 2 deletions

diff --git a/mysql-test/suite/parts/t/partition_alter2_1_innodb.test b/mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test
index b5f29e4ad72..9500f05b173 100644
--- a/mysql-test/suite/parts/t/partition_alter2_1_innodb.test
+++ b/mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test
@@ -1,5 +1,5 @@
 ################################################################################
-# t/partition_alter2_1_innodb.test                                             #
+# t/partition_alter2_1_1_innodb.test                                           #
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests around Alter column used in partitioning function                     #
@@ -39,6 +39,8 @@ SET @max_row = 20;
 ##### Execute more tests                                             #####
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
+# only do the first part
+let $only_part_1= 1;
 
 # The server must support partitioning.
 --source include/have_partition.inc
diff --git a/mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test b/mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test
new file mode 100644
index 00000000000..28bbcb3115b
--- /dev/null
+++ b/mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test
@@ -0,0 +1,82 @@
+################################################################################
+# t/partition_alter2_1_2_innodb.test                                           #
+#                                                                              #
+# Purpose:                                                                     #
+#  Tests around Alter column used in partitioning function                     #
+#        InnoDB branch                                                         #
+#                                                                              #
+#------------------------------------------------------------------------------#
+# Original Author: mleich                                                      #
+# Original Date: 2006-03-05                                                    #
+# Change Author:                                                               #
+# Change Date:                                                                 #
+# Change:                                                                      #
+################################################################################
+
+#
+# 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.
+#
+# 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;
+# only do the second part
+let $only_part_2= 1;
+
+# The server must support partitioning.
+--source include/have_partition.inc
+
+#------------------------------------------------------------------------------#
+# Engine specific settings and requirements
+
+##### Storage engine to be tested
+--source include/have_innodb.inc
+let $engine= 'InnoDB';
+
+##### Execute the test of "table" files
+# InnoDB has no files per PK, UI, ...
+let $do_file_tests= 0;
+
+##### Execute PRIMARY KEY tests                                      #####
+# 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
+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_1.inc
+
+#------------------------------------------------------------------------------#
+# Execute storage engine specific tests
+
+#------------------------------------------------------------------------------#
+# Cleanup
+--source suite/parts/inc/partition_cleanup.inc
diff --git a/mysql-test/suite/parts/t/partition_alter2_2_innodb.test b/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
index 1d8ac251aca..2bb30feb35d 100644
--- a/mysql-test/suite/parts/t/partition_alter2_2_innodb.test
+++ b/mysql-test/suite/parts/t/partition_alter2_2_1_innodb.test
@@ -1,5 +1,5 @@
 ################################################################################
-# t/partition_alter2_2_innodb.test                                             #
+# t/partition_alter2_2_1_innodb.test                                           #
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests around Alter column used in partitioning function                     #
@@ -39,6 +39,8 @@ SET @max_row = 20;
 ##### Execute more tests                                             #####
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
+# only do the first part
+let $only_part_1= 1;
 
 # The server must support partitioning.
 --source include/have_partition.inc
diff --git a/mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test b/mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test
new file mode 100644
index 00000000000..a356b4e31a3
--- /dev/null
+++ b/mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test
@@ -0,0 +1,82 @@
+################################################################################
+# t/partition_alter2_2_2_innodb.test                                           #
+#                                                                              #
+# Purpose:                                                                     #
+#  Tests around Alter column used in partitioning function                     #
+#        InnoDB branch                                                         #
+#                                                                              #
+#------------------------------------------------------------------------------#
+# Original Author: mleich                                                      #
+# Original Date: 2006-03-05                                                    #
+# Change Author:                                                               #
+# Change Date:                                                                 #
+# Change:                                                                      #
+################################################################################
+
+#
+# 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.
+#
+# 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;
+# only do the second part
+let $only_part_2= 1;
+
+# The server must support partitioning.
+--source include/have_partition.inc
+
+#------------------------------------------------------------------------------#
+# Engine specific settings and requirements
+
+##### Storage engine to be tested
+--source include/have_innodb.inc
+let $engine= 'InnoDB';
+
+##### Execute the test of "table" files
+# InnoDB has no files per PK, UI, ...
+let $do_file_tests= 0;
+
+##### Execute PRIMARY KEY tests                                      #####
+# 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
+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