Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51

mysql-test/r/ndb_restore.result

@@ -23,7 +23,7 @@ CREATE TABLE `t3_c` (
 `CapGoaledatta` smallint(5) unsigned NOT NULL default '0',
 `capgotod` smallint(5) unsigned NOT NULL default '0',
 PRIMARY KEY  (`capgotod`,`CapGoaledatta`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1;
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED;
 INSERT INTO `t3_c` VALUES (5,3),(2,4),(5,4),(1,3);
 CREATE TABLE `t4_c` (
 `capfa` bigint(20) unsigned NOT NULL auto_increment,
@@ -129,6 +129,8 @@ create table t7 engine=myisam as select * from t7_c;
 create table t8 engine=myisam as select * from t8_c;
 create table t9 engine=myisam as select * from t9_c;
 create table t10 engine=myisam as select * from t10_c;
+ForceVarPart: 0
+ForceVarPart: 1
 CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
 DELETE FROM test.backup_info;
 LOAD DATA INFILE '../tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
@@ -137,6 +139,8 @@ SELECT @the_backup_id:=backup_id FROM test.backup_info;
 <the_backup_id>
 DROP TABLE test.backup_info;
 drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c,t10_c;
+ForceVarPart: 0
+ForceVarPart: 1
 select count(*) from t1;
 count(*)
 5

mysql-test/r/ndb_restore_compat.result

@@ -47,11 +47,21 @@ SYSTEM_VALUES_ID	VALUE
 SELECT * FROM mysql.ndb_apply_status WHERE server_id=0;
 server_id	epoch	log_name	start_pos	end_pos
 0	151		0	0
+ForceVarPart: 1
+ForceVarPart: 1
+ForceVarPart: 1
+ForceVarPart: 1
+ForceVarPart: 1
 TRUNCATE GL;
 TRUNCATE ACCOUNT;
 TRUNCATE TRANSACTION;
 TRUNCATE SYSTEM_VALUES;
 TRUNCATE ACCOUNT_TYPE;
+ForceVarPart: 1
+ForceVarPart: 1
+ForceVarPart: 1
+ForceVarPart: 1
+ForceVarPart: 1
 SELECT * FROM GL            ORDER BY TIME,ACCOUNT_TYPE;
 TIME	ACCOUNT_TYPE	BALANCE	DEPOSIT_COUNT	DEPOSIT_SUM	WITHDRAWAL_COUNT	WITHDRAWAL_SUM	PURGED
 0	0	10000000	0	0	0	0	1

mysql-test/r/olap.result

@@ -607,6 +607,67 @@ x	a	sum(b)
 2006-07-01	NULL	11
 NULL	NULL	11
 drop table t1;
+CREATE TABLE t1 (a int, b int);
+INSERT INTO t1 
+VALUES (2,10),(3,30),(2,40),(1,10),(2,30),(1,20),(2,10);
+SELECT a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP;
+a	SUM(b)
+1	30
+2	90
+3	30
+NULL	150
+SELECT DISTINCT a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP;
+a	SUM(b)
+1	30
+2	90
+3	30
+NULL	150
+SELECT a, b, COUNT(*) FROM t1 GROUP BY a,b WITH ROLLUP;
+a	b	COUNT(*)
+1	10	1
+1	20	1
+1	NULL	2
+2	10	2
+2	30	1
+2	40	1
+2	NULL	4
+3	30	1
+3	NULL	1
+NULL	NULL	7
+SELECT DISTINCT a, b, COUNT(*) FROM t1 GROUP BY a,b WITH ROLLUP;
+a	b	COUNT(*)
+1	10	1
+1	20	1
+1	NULL	2
+2	10	2
+2	30	1
+2	40	1
+2	NULL	4
+3	30	1
+3	NULL	1
+NULL	NULL	7
+SELECT 'x', a, SUM(b) FROM t1 GROUP BY 1,2 WITH ROLLUP;
+x	a	SUM(b)
+x	1	30
+x	2	90
+x	3	30
+x	NULL	150
+NULL	NULL	150
+SELECT DISTINCT 'x', a, SUM(b) FROM t1 GROUP BY 1,2 WITH ROLLUP;
+x	a	SUM(b)
+x	1	30
+x	2	90
+x	3	30
+x	NULL	150
+NULL	NULL	150
+SELECT DISTINCT 'x', a, SUM(b) FROM t1 GROUP BY 1,2 WITH ROLLUP;
+x	a	SUM(b)
+x	1	30
+x	2	90
+x	3	30
+x	NULL	150
+NULL	NULL	150
+DROP TABLE t1;
 CREATE TABLE t1(id int, type char(1));
 INSERT INTO t1 VALUES
 (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),

mysql-test/r/type_datetime.result

@@ -221,15 +221,13 @@ f1	f2
 select 1 from dual where cast('2001-1-1 2:3:4' as date) = cast('2001-01-01' as datetime);
 1
 1
-select f1, f2, UNIX_TIMESTAMP(f2), UNIX_TIMESTAMP(f1),
-f1 > f2, f1 = f2, f1 < f2
-from t1;
-f1	f2	UNIX_TIMESTAMP(f2)	UNIX_TIMESTAMP(f1)	f1 > f2	f1 = f2	f1 < f2
-2001-01-01	2001-01-01 01:01:01	978300061	978296400	0	0	1
-2001-02-05	2001-02-05 00:00:00	981320400	981320400	0	1	0
-2001-03-10	2001-03-09 01:01:01	984088861	984171600	1	0	0
-2001-04-15	2001-04-15 00:00:00	987282000	987282000	0	1	0
-2001-05-20	2001-05-20 01:01:01	990309661	990306000	0	0	1
+select f1, f2, f1 > f2, f1 = f2, f1 < f2 from t1;
+f1	f2	f1 > f2	f1 = f2	f1 < f2
+2001-01-01	2001-01-01 01:01:01	0	0	1
+2001-02-05	2001-02-05 00:00:00	0	1	0
+2001-03-10	2001-03-09 01:01:01	1	0	0
+2001-04-15	2001-04-15 00:00:00	0	1	0
+2001-05-20	2001-05-20 01:01:01	0	0	1
 drop table t1;
 create table t1 (f1 date, f2 datetime, f3 timestamp);
 insert into t1 values('2001-01-01','2001-01-01 01:01:01','2001-01-01 01:01:01');

mysql-test/suite/partitions/include/methods1.inc → mysql-test/suite/parts/inc/methods1.inc

@@ -51,7 +51,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -66,7 +66,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -89,7 +89,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -113,7 +113,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -136,7 +136,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -162,7 +162,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -185,7 +185,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -208,6 +208,6 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;

mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc → mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc

 ################################################################################
-# t/partition_supported_sql_funcs_delete.inc                                   #           #                                                                              #
+# t/part_supported_sql_funcs_delete.inc                                   #           #                                                                              #
 # Purpose:                                                                     #
 #  Delete access of the tests frame for allowed sql functions                  #
 #                                                                              #

mysql-test/suite/partitions/include/partition_alter1.inc → mysql-test/suite/parts/inc/partition_alter1.inc

@@ -34,12 +34,12 @@ if ($do_pk_tests)
    {
       --echo #  1.1.1 PRIMARY KEY consisting of one column
       let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int1);
-      --source suite/partitions/include/partition_alter_11.inc
+      --source suite/parts/inc/partition_alter_11.inc
       # --source include/partition_alter_11.inc
    }
    # This must fail, because PRIMARY KEY does not contain f_int1
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int2);
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
 }
 # The value of the following test is maybe covered by 1.1.4.
@@ -47,29 +47,29 @@ if ($more_pk_ui_tests)
 {
    --echo #  1.1.2 UNIQUE INDEX consisting of one column
    let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int1);
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
 }
 # This must fail, because UNIQUE INDEX does not contain f_int1
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int2);
---source suite/partitions/include/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_11.inc
 # --source include/partition_alter_11.inc
 if ($do_pk_tests)
 {
    --echo #  1.1.3 PRIMARY KEY consisting of two columns
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_int2);
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_int1);
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
 }
 --echo #  1.1.4 UNIQUE INDEX consisting of two columns
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int1,f_int2);
---source suite/partitions/include/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_11.inc
 # --source include/partition_alter_11.inc
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int2,f_int1);
---source suite/partitions/include/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_11.inc
 # --source include/partition_alter_11.inc
 #
 --echo #------------------------------------------------------------------------
@@ -82,30 +82,30 @@ if ($do_pk_tests)
 {
    --echo #  1.2.1 PRIMARY KEY consisting of two columns
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_int2);
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_int1);
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
 }
 --echo #  1.2.2 UNIQUE INDEX consisting of two columns
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int1,f_int2);
---source suite/partitions/include/partition_alter_13.inc
+--source suite/parts/inc/partition_alter_13.inc
 # --source include/partition_alter_13.inc
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int2,f_int1);
---source suite/partitions/include/partition_alter_13.inc
+--source suite/parts/inc/partition_alter_13.inc
 # --source include/partition_alter_13.inc
 if ($do_pk_tests)
 {
    --echo #  1.2.3 PRIMARY KEY and UNIQUE INDEX consisting of two columns
    let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int1,f_int2), ADD PRIMARY KEY(f_int2,f_int1);
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
    let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int2,f_int1), ADD PRIMARY KEY(f_int1,f_int2);
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
    let $unique= ;
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
 }
 #
@@ -131,14 +131,14 @@ if ($more_pk_ui_tests)
       --echo #  2.1.1 DROP PRIMARY KEY consisting of one column
       let $unique= , PRIMARY KEY(f_int1);
       let $alter= ALTER TABLE t1 DROP PRIMARY KEY;
-      --source suite/partitions/include/partition_alter_11.inc
+      --source suite/parts/inc/partition_alter_11.inc
       # --source include/partition_alter_11.inc
    }
    #
    --echo #  2.1.2 DROP UNIQUE INDEX consisting of one column
    let $unique= , UNIQUE INDEX uidx1 (f_int1);
    let $alter= ALTER TABLE t1 DROP INDEX uidx1;
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
    #
    if ($do_pk_tests)
@@ -146,20 +146,20 @@ if ($more_pk_ui_tests)
       --echo #  2.1.3 DROP PRIMARY KEY consisting of two columns
       let $alter= ALTER TABLE t1 DROP PRIMARY KEY;
       let $unique= , PRIMARY KEY(f_int1,f_int2);
-      --source suite/partitions/include/partition_alter_11.inc
+      --source suite/parts/inc/partition_alter_11.inc
       # --source include/partition_alter_11.inc
       let $unique= , PRIMARY KEY(f_int2,f_int1);
-      --source suite/partitions/include/partition_alter_11.inc
+      --source suite/parts/inc/partition_alter_11.inc
       # --source include/partition_alter_11.inc
    }
    #
    --echo #  2.1.4 DROP UNIQUE INDEX consisting of two columns
    let $alter= ALTER TABLE t1 DROP INDEX uidx1;
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
    }
 #
@@ -168,16 +168,16 @@ if ($do_pk_tests)
    --echo #  2.1.5 DROP PRIMARY KEY + UNIQUE INDEX consisting of two columns
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY, DROP INDEX uidx1;
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY, DROP INDEX uidx1;
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);
 let $alter= ALTER TABLE t1 DROP INDEX uidx1, DROP INDEX uidx2;
---source suite/partitions/include/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_11.inc
 # --source include/partition_alter_11.inc
 #
 --echo #------------------------------------------------------------------------
@@ -190,20 +190,20 @@ if ($do_pk_tests)
    --echo #  2.2.1 DROP PRIMARY KEY consisting of two columns
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY;
    let $unique= , PRIMARY KEY(f_int1,f_int2);
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
    let $unique= , PRIMARY KEY(f_int2,f_int1);
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
 }
 #
 --echo #  2.2.2 DROP UNIQUE INDEX consisting of two columns
 let $alter= ALTER TABLE t1 DROP INDEX uidx1;
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
---source suite/partitions/include/partition_alter_13.inc
+--source suite/parts/inc/partition_alter_13.inc
 # --source include/partition_alter_13.inc
 let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
---source suite/partitions/include/partition_alter_13.inc
+--source suite/parts/inc/partition_alter_13.inc
 # --source include/partition_alter_13.inc
 #
 if ($do_pk_tests)
@@ -211,16 +211,16 @@ if ($do_pk_tests)
    --echo #  2.2.3 DROP PRIMARY KEY + UNIQUE INDEX consisting of two columns
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY, DROP INDEX uidx1;
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
       # --source include/partition_alter_13.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY, DROP INDEX uidx1;
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);
 let $alter= ALTER TABLE t1 DROP INDEX uidx1, DROP INDEX uidx2;
---source suite/partitions/include/partition_alter_13.inc
+--source suite/parts/inc/partition_alter_13.inc
 # --source include/partition_alter_13.inc
 
 if (0)

mysql-test/suite/partitions/include/partition_alter3.inc → mysql-test/suite/parts/inc/partition_alter3.inc

@@ -33,7 +33,7 @@ SELECT IF(9999 - 1000 + 1 > @max_row, @max_row , 9999 - 1000 + 1)
 # DEBUG SELECT @exp_row_count;
 # 4.   Print the layout, check Readability
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read1.inc
+--source suite/parts/inc/partition_check_read1.inc
 #
 --echo #------------------------------------------------------------------------
 --echo #  1.1   Increase number of PARTITIONS
@@ -45,16 +45,16 @@ ALTER TABLE t1 ADD PARTITION (PARTITION part2);
 --echo #  1.1.2 Assign HASH partitioning
 ALTER TABLE t1 PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER));
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read1.inc
+--source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.1.3 Assign other HASH partitioning to already partitioned table
 --echo #        + test and switch back + test
 ALTER TABLE t1 PARTITION BY HASH(CAST(f_varchar AS SIGNED INTEGER));
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read1.inc
+--source suite/parts/inc/partition_check_read1.inc
 ALTER TABLE t1 PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER));
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read1.inc
+--source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.1.4 Add PARTITIONS not fitting to HASH --> must fail
 --error ER_PARTITION_WRONG_VALUES_ERROR
@@ -65,7 +65,7 @@ ALTER TABLE t1 ADD PARTITION (PARTITION part2 VALUES LESS THAN (0));
 --echo #  1.1.5 Add two named partitions + test
 ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part7);
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read1.inc
+--source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.1.6 Add two named partitions, name clash --> must fail
 --error ER_SAME_NAME_PARTITION
@@ -74,12 +74,12 @@ ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part7);
 --echo #  1.1.7 Add one named partition + test
 ALTER TABLE t1 ADD PARTITION (PARTITION part2);
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read1.inc
+--source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.1.8 Add four not named partitions + test
 ALTER TABLE t1 ADD PARTITION PARTITIONS 4;
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read1.inc
+--source suite/parts/inc/partition_check_read1.inc
 
 --echo #------------------------------------------------------------------------
 --echo #  1.2   Decrease number of PARTITIONS
@@ -102,7 +102,7 @@ while ($loop)
 {
    ALTER TABLE t1 COALESCE PARTITION 1;
    --source include/partition_layout.inc
-   --source suite/partitions/include/partition_check_read1.inc
+   --source suite/parts/inc/partition_check_read1.inc
    dec $loop;
 }
 --echo #  1.2.5 COALESCE of last partition --> must fail
@@ -112,13 +112,13 @@ ALTER TABLE t1 COALESCE PARTITION 1;
 --echo #  1.2.6 Remove partitioning
 ALTER TABLE t1 REMOVE PARTITIONING;
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read1.inc
+--source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.2.7 Remove partitioning from not partitioned table --> ????
 ALTER TABLE t1 REMOVE PARTITIONING;
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
-# --source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
+# --source suite/parts/inc/partition_check_drop.inc
 
 --echo
 --echo #========================================================================
@@ -135,7 +135,7 @@ $column_list
 eval $insert_all;
 # 4.   Print the layout, check Readability
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read2.inc
+--source suite/parts/inc/partition_check_read2.inc
 #
 --echo #------------------------------------------------------------------------
 --echo #  2.1   Increase number of PARTITIONS
@@ -144,7 +144,7 @@ eval $insert_all;
 --echo #  2.1.1 Assign KEY partitioning
 ALTER TABLE t1 PARTITION BY KEY(f_int1);
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read2.inc
+--source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.1.2 Add PARTITIONS not fitting to KEY --> must fail
 --error ER_PARTITION_WRONG_VALUES_ERROR
@@ -155,17 +155,17 @@ ALTER TABLE t1 ADD PARTITION (PARTITION part2 VALUES LESS THAN (0));
 --echo #  2.1.3 Add two named partitions + test
 ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part7);
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read2.inc
+--source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.1.4 Add one named partition + test
 ALTER TABLE t1 ADD PARTITION (PARTITION part2);
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read2.inc
+--source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.1.5 Add four not named partitions + test
 ALTER TABLE t1 ADD PARTITION PARTITIONS 4;
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read2.inc
+--source suite/parts/inc/partition_check_read2.inc
 
 --echo #------------------------------------------------------------------------
 --echo #  2.2   Decrease number of PARTITIONS
@@ -181,7 +181,7 @@ while ($loop)
 {
    ALTER TABLE t1 COALESCE PARTITION 1;
    --source include/partition_layout.inc
-   --source suite/partitions/include/partition_check_read2.inc
+   --source suite/parts/inc/partition_check_read2.inc
    dec $loop;
 }
 --echo #  2.2.5 COALESCE of last partition --> must fail
@@ -191,11 +191,11 @@ ALTER TABLE t1 COALESCE PARTITION 1;
 --echo #  2.2.6 Remove partitioning
 ALTER TABLE t1 REMOVE PARTITIONING;
 --source include/partition_layout.inc
---source suite/partitions/include/partition_check_read2.inc
+--source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.2.7 Remove partitioning from not partitioned table --> ????
 ALTER TABLE t1 REMOVE PARTITIONING;
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
-# --source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
+# --source suite/parts/inc/partition_check_drop.inc
 

mysql-test/suite/partitions/include/partition_alter4.inc → mysql-test/suite/parts/inc/partition_alter4.inc

@@ -21,19 +21,19 @@
 --echo #------------------------------------------------------------------------
 --echo #  1.1 ALTER ... ANALYZE PARTITION part_1;
 let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  1.2 ALTER ... ANALYZE PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1,part_2;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  1.3 ALTER ... ANALYZE PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1,part_2,part_5,part_6,part_10;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  1.4 ALTER ... ANALYZE PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1,part_1,part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
@@ -41,19 +41,19 @@ let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1,part_1,part_1;
 --echo #------------------------------------------------------------------------
 --echo #  2.1 ALTER ... CHECK PARTITION part_1;
 let $alter= ALTER TABLE t1 CHECK PARTITION part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  2.2 ALTER ... CHECK PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 CHECK PARTITION part_1,part_2;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  2.3 ALTER ... CHECK PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 CHECK PARTITION part_1,part_2,part_5,part_6,part_10;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  2.4 ALTER ... CHECK PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 CHECK PARTITION part_1,part_1,part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
@@ -61,19 +61,19 @@ let $alter= ALTER TABLE t1 CHECK PARTITION part_1,part_1,part_1;
 --echo #------------------------------------------------------------------------
 --echo #  3.1 ALTER ... OPTIMIZE PARTITION part_1;
 let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  3.2 ALTER ... OPTIMIZE PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  3.3 ALTER ... OPTIMIZE PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2,part_5,part_6,part_10;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  3.4 ALTER ... OPTIMIZE PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_1,part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
@@ -81,19 +81,19 @@ let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_1,part_1;
 --echo #------------------------------------------------------------------------
 --echo #  4.1 ALTER ... REBUILD PARTITION part_1;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  4.2 ALTER ... REBUILD PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_2;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  4.3 ALTER ... REBUILD PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_2,part_5,part_6,part_10;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  4.4 ALTER ... REBUILD PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_1,part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
@@ -101,19 +101,19 @@ let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_1,part_1;
 --echo #------------------------------------------------------------------------
 --echo #  5.1 ALTER ... REBUILD PARTITION part_1;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  5.2 ALTER ... REBUILD PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_2;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  5.3 ALTER ... REBUILD PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_2,part_5,part_6,part_10;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 --echo #  5.4 ALTER ... REBUILD PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_1,part_1;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
@@ -121,6 +121,6 @@ let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_1,part_1;
 --echo #------------------------------------------------------------------------
 --echo #  6.1 ALTER ... REMOVE PARTITIONING;
 let $alter= ALTER TABLE t1 REMOVE PARTITIONING;
---source suite/partitions/include/partition_alter_41.inc
+--source suite/parts/inc/partition_alter_41.inc
 # --source include/partition_alter_41.inc
 

mysql-test/suite/partitions/include/partition_alter_1.inc → mysql-test/suite/parts/inc/partition_alter_1.inc

@@ -62,7 +62,7 @@ if ($unexpected_error)
 if ($run_test)
 {
 eval $insert_second_half;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 }
 DROP TABLE t1;

mysql-test/suite/partitions/include/partition_alter_11.inc → mysql-test/suite/parts/inc/partition_alter_11.inc

@@ -55,7 +55,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY KEY
@@ -68,7 +68,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST
@@ -89,7 +89,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE
@@ -111,7 +111,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
@@ -132,7 +132,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
@@ -156,7 +156,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
@@ -177,7 +177,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
@@ -198,5 +198,5 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc

mysql-test/suite/partitions/include/partition_alter_13.inc → mysql-test/suite/parts/inc/partition_alter_13.inc

@@ -55,7 +55,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY KEY
@@ -68,7 +68,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST
@@ -89,7 +89,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE
@@ -111,7 +111,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
@@ -132,7 +132,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
@@ -156,7 +156,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
@@ -177,7 +177,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
@@ -198,5 +198,5 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc

mysql-test/suite/partitions/include/partition_alter_41.inc → mysql-test/suite/parts/inc/partition_alter_41.inc

@@ -55,7 +55,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY KEY
@@ -68,7 +68,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST
@@ -89,7 +89,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE
@@ -111,7 +111,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
@@ -132,7 +132,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
@@ -156,7 +156,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
@@ -177,7 +177,7 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
@@ -198,5 +198,5 @@ $column_list
 $unique
 )
 $partitioning;
---source suite/partitions/include/partition_alter_1.inc
+--source suite/parts/inc/partition_alter_1.inc
 # --source include/partition_alter_1.inc

mysql-test/suite/partitions/include/partition_basic.inc → mysql-test/suite/parts/inc/partition_basic.inc

@@ -28,7 +28,7 @@
 --echo #------------------------------------------------------------------------
 --echo #  1.1 The partitioning function contains one column.
 let $unique= ;
---source suite/partitions/include/partition_methods1.inc
+--source suite/parts/inc/partition_methods1.inc
 # --source include/partition_methods1.inc
 #
    --echo # 1.1.1 with DATA DIECTORY/INDEX DIRECTORY
@@ -49,16 +49,16 @@ let $unique= ;
    let $index_directory = `select @indx_dir`;
 
    let $with_directories= 1;
-   --source suite/partitions/include/partition_methods1.inc
+   --source suite/parts/inc/partition_methods1.inc
    # --source include/partition_methods1.inc
-   --source suite/partitions/include/partition_directory.inc
+   --source suite/parts/inc/partition_directory.inc
    # --source include/partition_methods1.inc
    let $with_directories= 0;
    --enable_query_log
    #
 --echo #  1.2 The partitioning function contains two columns.
 let $unique= ;
---source suite/partitions/include/partition_methods2.inc
+--source suite/parts/inc/partition_methods2.inc
 # --source include/partition_methods2.inc
 #
 --echo #------------------------------------------------------------------------
@@ -71,12 +71,12 @@ if ($more_pk_ui_tests)
    {
       --echo #  2.1 PRIMARY KEY consisting of one column
       let $unique= , PRIMARY KEY(f_int1);
-      --source suite/partitions/include/partition_methods1.inc
+      --source suite/parts/inc/partition_methods1.inc
       # --source include/partition_methods1.inc
    }
    --echo #  2.2 UNIQUE INDEX consisting of one column
    let $unique= , UNIQUE INDEX uidx1 (f_int1);
-   --source suite/partitions/include/partition_methods1.inc
+   --source suite/parts/inc/partition_methods1.inc
    # --source include/partition_methods1.inc
 
    --echo # 2.2.1 with DATA DIECTORY/INDEX DIRECTORY
@@ -97,7 +97,7 @@ if ($more_pk_ui_tests)
    let $index_directory = `select @indx_dir`;
 
    let $with_directories= TRUE;
-   --source suite/partitions/include/partition_methods1.inc
+   --source suite/parts/inc/partition_methods1.inc
    # --source include/partition_methods1.inc
    let $with_directories= FALSE;
    --enable_query_log
@@ -106,19 +106,19 @@ if ($more_pk_ui_tests)
    {
       --echo #  2.3 PRIMARY KEY consisting of two columns
       let $unique= , PRIMARY KEY(f_int1,f_int2);
-      --source suite/partitions/include/partition_methods1.inc
+      --source suite/parts/inc/partition_methods1.inc
       # --source include/partition_methods1.inc
       let $unique= , PRIMARY KEY(f_int2,f_int1);
-      --source suite/partitions/include/partition_methods1.inc
+      --source suite/parts/inc/partition_methods1.inc
       # --source include/partition_methods1.inc
    }
    #
    --echo #  2.4 UNIQUE INDEX consisting of two columns
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
-   --source suite/partitions/include/partition_methods1.inc
+   --source suite/parts/inc/partition_methods1.inc
    # --source include/partition_methods1.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
-   --source suite/partitions/include/partition_methods1.inc
+   --source suite/parts/inc/partition_methods1.inc
    # --source include/partition_methods1.inc
    #
 }
@@ -126,14 +126,14 @@ if ($more_pk_ui_tests)
 if ($do_pk_tests)
 {
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);
-   --source suite/partitions/include/partition_methods1.inc
+   --source suite/parts/inc/partition_methods1.inc
    # --source include/partition_methods1.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);
-   --source suite/partitions/include/partition_methods1.inc
+   --source suite/parts/inc/partition_methods1.inc
    # --source include/partition_methods1.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);
---source suite/partitions/include/partition_methods1.inc
+--source suite/parts/inc/partition_methods1.inc
 # --source include/partition_methods1.inc
 
 --echo #------------------------------------------------------------------------
@@ -147,20 +147,20 @@ if ($more_pk_ui_tests)
    {
       --echo #  3.1 PRIMARY KEY consisting of two columns
       let $unique= , PRIMARY KEY(f_int1,f_int2);
-      --source suite/partitions/include/partition_methods2.inc
+      --source suite/parts/inc/partition_methods2.inc
       # --source include/partition_methods2.inc
 
       let $unique= , PRIMARY KEY(f_int2,f_int1);
-      --source suite/partitions/include/partition_methods2.inc
+      --source suite/parts/inc/partition_methods2.inc
       # --source include/partition_methods2.inc
    }
    #
    --echo #  3.2 UNIQUE INDEX consisting of two columns
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
-   --source suite/partitions/include/partition_methods2.inc
+   --source suite/parts/inc/partition_methods2.inc
    # --source include/partition_methods2.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
-   --source suite/partitions/include/partition_methods2.inc
+   --source suite/parts/inc/partition_methods2.inc
    # --source include/partition_methods2.inc
 }
 #
@@ -168,12 +168,12 @@ if ($more_pk_ui_tests)
 if ($do_pk_tests)
 {
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);
-   --source suite/partitions/include/partition_methods2.inc
+   --source suite/parts/inc/partition_methods2.inc
    # --source include/partition_methods2.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);
-   --source suite/partitions/include/partition_methods2.inc
+   --source suite/parts/inc/partition_methods2.inc
    # --source include/partition_methods2.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);
---source suite/partitions/include/partition_methods2.inc
+--source suite/parts/inc/partition_methods2.inc
 # --source include/partition_methods2.inc

mysql-test/suite/partitions/include/partition_check.inc → mysql-test/suite/parts/inc/partition_check.inc

@@ -45,7 +45,7 @@
 
 --echo # Start usability test (include/partition_check.inc)
 # Print the CREATE TABLE STATEMENT and store the current layout of the table
---source suite/partitions/include/partition_layout_check1.inc
+--source suite/parts/inc/partition_layout_check1.inc
 # --source include/partition_layout_check1.inc
 
 
@@ -283,12 +283,12 @@ if ($any_unique)
 ## 2.1  Read all existing and some not existing records of table
 #       per f_int1 used in partitioning function
 let $col_to_check= f_int1;
---source suite/partitions/include/partition_check_read.inc
+--source suite/parts/inc/partition_check_read.inc
 # --source include/partition_check_read.inc
 ## 2.2  Read all existing and some not existing records of table
 #       per f_int2 used in partitioning function
 let $col_to_check= f_int2;
---source suite/partitions/include/partition_check_read.inc
+--source suite/parts/inc/partition_check_read.inc
 
 if ($fixed_bug18735)
 {
@@ -690,7 +690,7 @@ if ($any_unique)
       ON DUPLICATE KEY
       UPDATE f_int1 = 2 * @max_row + source_tab.f_int1,
              f_charbig = 'was updated';
-      --source suite/partitions/include/partition_20.inc
+      --source suite/parts/inc/partition_20.inc
       # --source include/partition_20.inc
    }
 
@@ -706,7 +706,7 @@ if ($any_unique)
       ON DUPLICATE KEY
       UPDATE f_int2 = 2 * @max_row + source_tab.f_int1,
              f_charbig = 'was updated';
-      --source suite/partitions/include/partition_20.inc
+      --source suite/parts/inc/partition_20.inc
       # --source include/partition_20.inc
    }
 
@@ -720,7 +720,7 @@ if ($any_unique)
    UPDATE f_int1 = 2 * @max_row + source_tab.f_int1,
           f_int2 = 2 * @max_row + source_tab.f_int1,
           f_charbig = 'was updated';
-   --source suite/partitions/include/partition_20.inc
+   --source suite/parts/inc/partition_20.inc
       # --source include/partition_20.inc
 
    ## 6.4 REPLACE
@@ -991,28 +991,28 @@ let $statement= INSERT INTO t0_aux(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,NULL FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 - 1 AND @max_row_div2 + 1;
 let $event= BEFORE INSERT;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 let $event= AFTER INSERT;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 
 let $statement= UPDATE t0_aux SET f_int1 =  - f_int1, f_int2 = - f_int2
 WHERE f_int1 IN (- (@max_row_div2 - 1),- @max_row_div2,- (@max_row_div2 + 1));
 let $event= BEFORE UPDATE;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 let $event= AFTER UPDATE;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 
 let $statement= DELETE FROM t0_aux
 WHERE f_int1 IN (- (@max_row_div2 - 1),- @max_row_div2,- (@max_row_div2 + 1));
 let $event= BEFORE DELETE;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 let $event= AFTER DELETE;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 
 # Cleanup
@@ -1045,28 +1045,28 @@ let $statement= INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,NULL FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 - 1 AND @max_row_div2 + 1;
 let $event= BEFORE INSERT;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 let $event= AFTER INSERT;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 
 let $statement= UPDATE t1 SET f_int1 =  - f_int1, f_int2 = - f_int2
 WHERE f_int1 IN (- (@max_row_div2 - 1),- @max_row_div2,- (@max_row_div2 + 1));
 let $event= BEFORE UPDATE;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 let $event= AFTER UPDATE;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 
 let $statement= DELETE FROM t1
 WHERE f_int1 IN (- (@max_row_div2 - 1),- @max_row_div2,- (@max_row_div2 + 1));
 let $event= BEFORE DELETE;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 let $event= AFTER DELETE;
---source suite/partitions/include/partition_trigg1.inc
+--source suite/parts/inc/partition_trigg1.inc
 # --source include/partition_trigg1.inc
 eval DELETE FROM $tab_in_trigg
 WHERE f_int1 BETWEEN @max_row_div2 - 1 AND @max_row_div2 + 1;
@@ -1088,7 +1088,7 @@ let $statement= UPDATE t1
 SET f_charbig = '####updated per update statement itself####';
 let $source= old;
 let $event= BEFORE UPDATE;
---source suite/partitions/include/partition_trigg2.inc
+--source suite/parts/inc/partition_trigg2.inc
 # --source include/partition_trigg2.inc
 # FIXME when AFTER TRIGGER can be used
 # Currently (2006-02-23) a AFTER TRIGGER is not allowed to modify a row, which
@@ -1104,7 +1104,7 @@ f_charbig = '####updated per update statement itself####';
 # 9.3.2.1 "old" values are used as source within the trigger.
 let $source= old;
 let $event= BEFORE UPDATE;
---source suite/partitions/include/partition_trigg2.inc
+--source suite/parts/inc/partition_trigg2.inc
 # --source include/partition_trigg2.inc
 # FIXME when AFTER TRIGGER can be used
 # Currently (2006-02-23) a AFTER TRIGGER is not allowed to modify a row, which
@@ -1112,7 +1112,7 @@ let $event= BEFORE UPDATE;
 # 9.3.2.2 "new" values are used as source within the trigger.
 let $source= new;
 let $event= BEFORE UPDATE;
---source suite/partitions/include/partition_trigg2.inc
+--source suite/parts/inc/partition_trigg2.inc
 # --source include/partition_trigg2.inc
 # FIXME when AFTER TRIGGER can be used
 
@@ -1131,7 +1131,7 @@ WHERE f_int1 BETWEEN @max_row_div2 - 1 AND @max_row_div2 + 1
 ORDER BY f_int1;
 let $event= BEFORE INSERT;
 let $source= new;
---source suite/partitions/include/partition_trigg3.inc
+--source suite/parts/inc/partition_trigg3.inc
 # --source include/partition_trigg3.inc
 # FIXME when AFTER TRIGGER can be used
 
@@ -1143,7 +1143,7 @@ WHERE f_int1 BETWEEN @max_row_div2 - 1 AND @max_row_div2 + 1
 ORDER BY f_int1;
 let $event= BEFORE INSERT;
 let $source= new;
---source suite/partitions/include/partition_trigg3.inc
+--source suite/parts/inc/partition_trigg3.inc
 # --source include/partition_trigg3.inc
 # FIXME when AFTER TRIGGER can be used
 
@@ -1174,11 +1174,11 @@ CHECKSUM TABLE t1 EXTENDED;
 #      clustered index.
 #      FIXME What will happen with NDB ?
 OPTIMIZE TABLE t1;
---source suite/partitions/include/partition_layout_check2.inc
+--source suite/parts/inc/partition_layout_check2.inc
 # --source include/partition_layout_check2.inc
 # 10.2 REPAIR TABLE
 REPAIR   TABLE t1 EXTENDED;
---source suite/partitions/include/partition_layout_check2.inc
+--source suite/parts/inc/partition_layout_check2.inc
 # --source include/partition_layout_check2.inc
 #
 # 11.3 Truncate
@@ -1192,7 +1192,7 @@ if ($no_debug)
 }
 SELECT '# check TRUNCATE success: ' AS "",COUNT(*) = 0 AS "" FROM t1;
 --enable_query_log
---source suite/partitions/include/partition_layout_check2.inc
+--source suite/parts/inc/partition_layout_check2.inc
 # --source include/partition_layout_check2.inc
 --echo # End usability test (include/partition_check.inc)
 

mysql-test/suite/partitions/include/partition_directory.inc → mysql-test/suite/parts/inc/partition_directory.inc

@@ -48,10 +48,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY KEY
 if ($with_partitioning)
@@ -85,10 +85,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY LIST
 if ($with_partitioning)
@@ -120,10 +120,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY RANGE
 if ($with_partitioning)
@@ -151,10 +151,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -179,10 +179,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -210,10 +210,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -254,10 +254,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 let $with_directories= FALSE;
 

mysql-test/suite/partitions/include/partition_engine.inc → mysql-test/suite/parts/inc/partition_engine.inc

@@ -44,7 +44,7 @@ $column_list
      PARTITION BY HASH(f_int1) PARTITIONS 2;
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 #
@@ -61,7 +61,7 @@ PARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
@@ -78,7 +78,7 @@ SUBPARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 #
@@ -95,7 +95,7 @@ PARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
@@ -107,7 +107,7 @@ PARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
@@ -124,7 +124,7 @@ SUBPARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
@@ -141,7 +141,7 @@ SUBPARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 #
@@ -163,7 +163,7 @@ SUBPARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
@@ -180,7 +180,7 @@ SUBPARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 #
@@ -198,7 +198,7 @@ PARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
@@ -215,7 +215,7 @@ SUBPARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 --echo # 6.2 Storage engine assignment after partition name + after
@@ -235,7 +235,7 @@ SUBPARTITION BY HASH(f_int1)
 );
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -251,7 +251,7 @@ $column_list
 PARTITION BY HASH(f_int1) ( PARTITION part1 ENGINE = $engine);
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 # Bug#15966 Partitions: crash if session default engine <> engine used in create table
@@ -265,7 +265,7 @@ SUBPARTITION BY HASH(f_int1)
       SUBPARTITION subpart12 STORAGE ENGINE = $engine));
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 eval SET SESSION storage_engine=$engine;

mysql-test/suite/partitions/include/partition_methods1.inc → mysql-test/suite/parts/inc/partition_methods1.inc

@@ -65,10 +65,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY KEY
 if ($with_partitioning)
@@ -107,10 +107,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY LIST
 if ($with_partitioning)
@@ -142,10 +142,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY RANGE
 if ($with_partitioning)
@@ -179,10 +179,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -211,10 +211,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -246,10 +246,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -298,10 +298,10 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -328,8 +328,8 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
---source suite/partitions/include/partition_check_drop.inc
+--source suite/parts/inc/partition_check_drop.inc
 let $with_directories= FALSE;

mysql-test/suite/partitions/include/partition_methods2.inc → mysql-test/suite/parts/inc/partition_methods2.inc

@@ -50,7 +50,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -65,7 +65,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -88,7 +88,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -112,7 +112,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -135,7 +135,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -161,7 +161,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -184,7 +184,7 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;
 
@@ -207,6 +207,6 @@ $unique
 )
 $partitioning;
 eval $insert_all;
---source suite/partitions/include/partition_check.inc
+--source suite/parts/inc/partition_check.inc
 # --source include/partition_check.inc
 DROP TABLE t1;

mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc → mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc

@@ -84,13 +84,13 @@ eval insert into t3 values ($val2);
 eval insert into t3 values ($val3);
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t4;
+eval load data infile '$MYSQL_TEST_DIR/suite/parts/inc/$infile' into table t4;
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t5;
+eval load data infile '$MYSQL_TEST_DIR/suite/parts/inc/$infile' into table t5;
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t6;
+eval load data infile '$MYSQL_TEST_DIR/suite/parts/inc/$infile' into table t6;
 
 eval select $sqlfunc from t1 order by col1;
 
@@ -238,8 +238,8 @@ subpartition by hash($sqlfunc) subpartitions 5
 	let $t4=t4;
 	let $t5=t5;
 	let $t6=t6;
-	--source suite/partitions/include/partition_supported_sql_funcs_delete.inc
-	# --source include/partition_supported_sql_funcs_delete.inc
+	--source suite/parts/inc/part_supported_sql_funcs_delete.inc
+	# --source include/part_supported_sql_funcs_delete.inc
 
 	let $t1=t11;
 	let $t2=t22;
@@ -247,8 +247,8 @@ subpartition by hash($sqlfunc) subpartitions 5
 	let $t4=t44;
 	let $t5=t55;
 	let $t6=t66;
-	--source suite/partitions/include/partition_supported_sql_funcs_delete.inc
-	# --source include/partition_supported_sql_funcs_delete.inc
+	--source suite/parts/inc/part_supported_sql_funcs_delete.inc
+	# --source include/part_supported_sql_funcs_delete.inc
         --echo -------------------------
         --echo ---- some alter table end
         --echo -------------------------

mysql-test/suite/partitions/include/partition_syntax_1.inc → mysql-test/suite/parts/inc/partition_syntax_1.inc

@@ -47,7 +47,7 @@ if ($unexpected_error)
 # If this operation was successfull, print layout + drop this table
 if ($run)
 {
-   --source suite/partitions/include/partition_layout_check1.inc
+   --source suite/parts/inc/partition_layout_check1.inc
    # --source include/partition_layout_check1.inc
    eval DROP TABLE t1;
 }
@@ -85,7 +85,7 @@ if ($unexpected_error)
 # If this operation was successfull, print layout + drop this table
 if ($run)
 {
-   --source suite/partitions/include/partition_layout_check1.inc
+   --source suite/parts/inc/partition_layout_check1.inc
    # --source include/partition_layout_check1.inc
    eval DROP TABLE t1;
 }

mysql-test/suite/partitions/include/partition_syntax_2.inc → mysql-test/suite/parts/inc/partition_syntax_2.inc

@@ -37,7 +37,7 @@ if (`SELECT @@session.storage_engine IN('ndbcluster')`)
    eval $insert_all;
    if ($fixed_bug18735)
    {
-   --source suite/partitions/include/partition_check.inc
+   --source suite/parts/inc/partition_check.inc
    # --source include/partition_check.inc
    }
    DROP TABLE t1;
@@ -49,7 +49,7 @@ if (`SELECT @@session.storage_engine IN('ndbcluster')`)
    eval $insert_all;
    if ($fixed_bug18735)
    {
-   --source suite/partitions/include/partition_check.inc
+   --source suite/parts/inc/partition_check.inc
    # --source include/partition_check.inc
    }
    DROP TABLE t1;

mysql-test/suite/partitions/r/ndb_partition_key.result → mysql-test/suite/parts/r/ndb_partition_key.result

@@ -57,6 +57,8 @@ Number of primary keys: 3
 Length of frm data: #
 Row Checksum: 1
 Row GCI: 1
+SingleUserMode: 0
+ForceVarPart: 1
 TableStatus: Retrieved
 -- Attributes -- 
 a Int PRIMARY KEY AT=FIXED ST=MEMORY