167 files changed, 821 insertions, 819 deletions
diff --git a/mysql-test/suite/partitions/include/methods1.inc b/mysql-test/suite/parts/inc/methods1.inc
index ea0e1e04e53..24006b6e0f1 100644
--- a/mysql-test/suite/partitions/include/methods1.inc
+++ b/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;
diff --git a/mysql-test/suite/partitions/include/partition_blocked_sql_funcs_main.inc b/mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc
index a326a363b20..ec258b5387b 100644
--- a/mysql-test/suite/partitions/include/partition_blocked_sql_funcs_main.inc
+++ b/mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc
@@ -20,241 +20,241 @@
 let $sqlfunc = greatest(col1,15);
 let $valsqlfunc = greatest(1,15);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = isnull(col1);
 let $valsqlfunc = isnull(15);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = least(col1,15);
 let $valsqlfunc = least(15,30);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = case when col1>15 then 20 else 10 end;
 let $valsqlfunc = case when 1>30 then 20 else 15 end;
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = ifnull(col1,30);
 let $valsqlfunc = ifnull(1,30);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = nullif(col1,30);
 let $valsqlfunc = nullif(1,30);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = bit_length(col1);
 let $valsqlfunc = bit_length(255);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = char_length(col1);
 let $valsqlfunc = char_length('a');
 #let $coltype = int;
-#--source suite/partitions/include/partition_blocked_sql_funcs.inc
+#--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = character_length(col1);
 let $valsqlfunc = character_length('a');
 let $coltype = char(30)
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = find_in_set(col1,'1,2,3,4,5,6,7,8,9');
 let $valsqlfunc = find_in_set('i','a,b,c,d,e,f,g,h,i');
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = instr(col1,'acb');
 let $valsqlfunc = instr('i','a,b,c,d,e,f,g,h,i');
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = length(col1);
 let $valsqlfunc = length('a,b,c,d,e,f,g,h,i');
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = locate('a',col1);
 let $valsqlfunc = locate('i','a,b,c,d,e,f,g,h,i');
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = octet_length(col1);
 let $valsqlfunc = octet_length('a,b,c,d,e,f,g,h,i');
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = position('a' in col1);
 let $valsqlfunc = position('i' in 'a,b,c,d,e,f,g,h,i');
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = strcmp(col1,'acb');
 let $valsqlfunc = strcmp('i','a,b,c,d,e,f,g,h,i');
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = crc32(col1);
 let $valsqlfunc = crc32('a,b,c,d,e,f,g,h,i');
 let $coltype = char(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = round(col1);
 let $valsqlfunc = round(15);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = sign(col1);
 let $valsqlfunc = sign(123);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = datediff(col1,col1);
 let $valsqlfunc = datediff('1997-11-30 23:59:59','1997-12-31');
 let $coltype = datetime;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = period_add(col1,5);
 let $valsqlfunc = period_add(9804,5);
 let $coltype = datetime;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = period_diff(col1,col2);
 let $valsqlfunc = period_diff(9809,199907);
 let $coltype = datetime,col2 datetime;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 let $coltype = int,col2 int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = timestampdiff(day,5,col1);
 let $valsqlfunc = timestampdiff(YEAR,'2002-05-01','2001-01-01');
 let $coltype = datetime;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = unix_timestamp(col1);
 let $valsqlfunc = unix_timestamp ('2002-05-01');
 let $coltype = date;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = week(col1);
 let $valsqlfunc = week('2002-05-01');
 let $coltype = datetime;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = cast(col1 as signed);
 let $valsqlfunc = cast(123 as signed);
 let $coltype = varchar(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = convert(col1,unsigned);
 let $valsqlfunc = convert(123,unsigned);
 let $coltype = varchar(30);
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 | 20;
 let $valsqlfunc = 10 | 20;
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 & 20;
 let $valsqlfunc = 10 & 20;
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 ^ 20;
 let $valsqlfunc = 10 ^ 20;
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 << 20;
 let $valsqlfunc = 10 << 20;
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 >> 20;
 let $valsqlfunc = 10 >> 20;
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = ~col1;
 let $valsqlfunc = ~20;
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = bit_count(col1);
 let $valsqlfunc = bit_count(20);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = inet_aton(col1);
 let $valsqlfunc = inet_aton('192.168.1.1');
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 set @var =20;
 let $sqlfunc = bit_length(col1)+@var-@var;
 let $valsqlfunc = bit_length(20)+@var-@var;
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 
 
@@ -285,6 +285,6 @@ delimiter ;//
 let $sqlfunc = getmaxsigned_t1(col1);
 let $valsqlfunc = getmaxsigned(10);
 let $coltype = int;
---source suite/partitions/include/partition_blocked_sql_funcs.inc
+--source suite/parts/inc/partition_blocked_sql_funcs.inc
 # --source include/partition_blocked_sql_funcs.inc
 drop function if exists getmaxsigned_t1;
diff --git a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc b/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
index 76e8bd6dcc6..c0769cdeef1 100644
--- a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
@@ -1,5 +1,5 @@
 ################################################################################
-# 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                  #
 #                                                                              #
diff --git a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc
index 8ae6e5fc807..8ae6e5fc807 100644
--- a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc
diff --git a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_date.in b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc
index 9eb41fb007b..9eb41fb007b 100644
--- a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_date.in
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc
diff --git a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_float.in b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc
index 34d8b1d1c4d..34d8b1d1c4d 100644
--- a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_float.in
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc
diff --git a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_int.in b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc
index d2f5c82a241..d2f5c82a241 100644
--- a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_int.in
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc
diff --git a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_time.in b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc
index 941ba418f32..941ba418f32 100644
--- a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_time.in
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc
diff --git a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc b/mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
index b0ec63d39a9..4dc0e7bdad3 100644
--- a/mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
@@ -22,7 +22,7 @@
 # The test frame includes CREATE/ALTER TABLE and some access statements.       #
 # Column types are int, float(7,4), char(1), date and time depending on the    #
 # SQL function. The test frame uses the include file                           # 
-# "partition_supported_sql_funcs_delete.inc" testing the deletion of           #
+# "part_supported_sql_funcs_delete.inc" testing the deletion of           #
 # partitions.                                                                  #
 # The CREATE and ALTER TABLE statement do not cover the complete partitions    #
 # functions, but will ashure that the SQL functions are basically working.     #
@@ -32,147 +32,147 @@
 let $sqlfunc = abs(col1);
 let $valsqlfunc = abs(15);
 let $coltype = int;
-let $infile = partition_supported_sql_funcs_int_int.in;
+let $infile = part_supported_sql_funcs_int_int.inc;
 let $val1 =  5 ;
 let $val2 = 13 ;
 let $val3 = 17 ;
 let $val4 = 15 ;
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = ascii(col1);
 let $valsqlfunc = ascii('5');
 let $coltype = char(1);
-let $infile = partition_supported_sql_funcs_int_ch1.in;
+let $infile = part_supported_sql_funcs_int_ch1.inc;
 let $val1 =  '1';
 let $val2 =  '9';
 let $val3 =  '3';
 let $val4 =  '8';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = cast(ceiling(col1) as signed integer);
 let $valsqlfunc = cast(ceiling(15) as signed integer);
 let $coltype = float(7,4);
-let $infile = partition_supported_sql_funcs_int_float.in;
+let $infile = part_supported_sql_funcs_int_float.inc;
 let $val1 =  5.1230;
 let $val2 = 13.345;
 let $val3 = 17.987;
 let $val4 = 15.654 ;
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = cast(floor(col1) as signed);
 let $valsqlfunc = cast(floor(15.123) as signed);
 let $coltype = float(7,4);
-let $infile = partition_supported_sql_funcs_int_float.in;
+let $infile = part_supported_sql_funcs_int_float.inc;
 let $val1 =  5.1230;
 let $val2 = 13.345;
 let $val3 = 17.987;
 let $val4 = 15.654 ;
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = cast(mod(col1,10) as signed);
 let $valsqlfunc = cast(mod(15,10) as signed);
 let $coltype = float(7,4);
-let $infile = partition_supported_sql_funcs_int_float.in;
+let $infile = part_supported_sql_funcs_int_float.inc;
 let $val1 =  5.0000;
 let $val2 = 19;
 let $val3 = 17;
 let $val4 = 15 ;
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = ord(col1);
 let $valsqlfunc = ord('a');
 let $coltype = char(3);
-let $infile = partition_supported_sql_funcs_int_ch1.in;
+let $infile = part_supported_sql_funcs_int_ch1.inc;
 let $val1 =  '1';
 let $val2 =  '9';
 let $val3 =  '3';
 let $val4 =  '8';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = day(col1);
 let $valsqlfunc = day('2006-12-21');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-02-03';
 let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-05';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = dayofmonth(col1);
 let $valsqlfunc = dayofmonth('2006-12-24');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-02-03';
 let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-05';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = dayofweek(col1);
 let $valsqlfunc = dayofweek('2006-12-24');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-02-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-05';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = dayofyear(col1);
 let $valsqlfunc = dayofyear('2006-12-25');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-01-17';
 let $val3 =  '2006-02-25';
 let $val4 =  '2006-02-05';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = extract(month from col1);
 let $valsqlfunc = extract(year from '1998-11-23');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-02-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-05';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = hour(col1);
 let $valsqlfunc = hour('18:30');
 let $coltype = time;
-let $infile = partition_supported_sql_funcs_int_time.in;
+let $infile = part_supported_sql_funcs_int_time.inc;
 let $val1 =  '09:09';
 let $val2 =  '14:30';
 let $val3 =  '21:59';
 let $val4 =  '10:30';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = microsecond(col1);
 let $valsqlfunc = microsecond('10:30:10.000010');
 let $coltype = time;
-let $infile = partition_supported_sql_funcs_int_time.in;
+let $infile = part_supported_sql_funcs_int_time.inc;
 let $val1 =  '09:09:15.000002';
 let $val2 =  '04:30:01.000018';
 let $val3 =  '00:59:22.000024';
 let $val4 =  '05:30:34.000037';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = minute(col1);
@@ -182,107 +182,107 @@ let $val1 =  '09:09:15';
 let $val2 =  '14:30:45';
 let $val3 =  '21:59:22';
 let $val4 =  '10:24:23';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = second(col1);
 let $valsqlfunc = second('18:30:14');
 let $coltype = time;
-let $infile = partition_supported_sql_funcs_int_time.in;
+let $infile = part_supported_sql_funcs_int_time.inc;
 let $val1 =  '09:09:09';
 let $val2 =  '14:30:20';
 let $val3 =  '21:59:22';
 let $val4 =  '10:22:33';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 let $coltype = char(30);
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = month(col1);
 let $valsqlfunc = month('2006-10-14');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-12-17';
 let $val3 =  '2006-05-25';
 let $val4 =  '2006-11-06';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = quarter(col1);
 let $valsqlfunc = quarter('2006-10-14');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-12-17';
 let $val3 =  '2006-09-25';
 let $val4 =  '2006-07-30';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = time_to_sec(col1)-(time_to_sec(col1)-20);
 let $valsqlfunc = time_to_sec('18:30:14')-(time_to_sec('17:59:59'));
 let $coltype = time;
-let $infile = partition_supported_sql_funcs_int_time.in;
+let $infile = part_supported_sql_funcs_int_time.inc;
 let $val1 =  '09:09:15';
 let $val2 =  '14:30:45';
 let $val3 =  '21:59:22';
 let $val4 =  '10:33:11';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = to_days(col1)-to_days('2006-01-01');
 let $valsqlfunc = to_days('2006-02-02')-to_days('2006-01-01');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-02-03';
 let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-06';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = weekday(col1);
 let $valsqlfunc = weekday('2006-10-14');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-12-03';
 let $val2 =  '2006-11-17';
 let $val3 =  '2006-05-25';
 let $val4 =  '2006-02-06';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = weekofyear(col1);
 let $valsqlfunc = weekofyear('2006-02-14');
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-03-17';
 let $val3 =  '2006-05-25';
 let $val4 =  '2006-09-06';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = year(col1)-1990;
 let $valsqlfunc = year('2005-10-14')-1990;
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '1996-01-03';
 let $val2 =  '2000-02-17';
 let $val3 =  '2004-05-25';
 let $val4 =  '2002-02-15';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = yearweek(col1)-200600;
 let $valsqlfunc = yearweek('2006-10-14')-200600;
 let $coltype = date;
-let $infile = partition_supported_sql_funcs_int_date.in;
+let $infile = part_supported_sql_funcs_int_date.inc;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-08-17';
 let $val3 =  '2006-03-25';
 let $val4 =  '2006-11-15';
---source suite/partitions/include/partition_supported_sql_funcs.inc
+--source suite/parts/inc/partition_supported_sql_funcs.inc
 # --source include/partition_supported_sql_funcs.inc
diff --git a/mysql-test/suite/partitions/include/partition.pre b/mysql-test/suite/parts/inc/partition.pre
index c09cfed29e6..c09cfed29e6 100644
--- a/mysql-test/suite/partitions/include/partition.pre
+++ b/mysql-test/suite/parts/inc/partition.pre
diff --git a/mysql-test/suite/partitions/include/partition_20.inc b/mysql-test/suite/parts/inc/partition_20.inc
index 7901b332a11..7901b332a11 100644
--- a/mysql-test/suite/partitions/include/partition_20.inc
+++ b/mysql-test/suite/parts/inc/partition_20.inc
diff --git a/mysql-test/suite/partitions/include/partition_alter1.inc b/mysql-test/suite/parts/inc/partition_alter1.inc
index b767be4eafc..a9706d5eb98 100644
--- a/mysql-test/suite/partitions/include/partition_alter1.inc
+++ b/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)
diff --git a/mysql-test/suite/partitions/include/partition_alter2.inc b/mysql-test/suite/parts/inc/partition_alter2.inc
index 720856e20bc..3e01c3972bc 100644
--- a/mysql-test/suite/partitions/include/partition_alter2.inc
+++ b/mysql-test/suite/parts/inc/partition_alter2.inc
@@ -26,7 +26,7 @@
 let $alter= ALTER TABLE t1 MODIFY f_int2 BIGINT;
 --echo #  1.1.1 no PRIMARY KEY or UNIQUE INDEX exists
 let $unique= ;
---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)
@@ -37,14 +37,14 @@ if ($do_pk_tests)
    if ($more_pk_ui_tests)
    {
       let $unique= , 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
    }
    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
 }
 #
@@ -54,14 +54,14 @@ if ($do_pk_tests)
 if ($more_pk_ui_tests)
 {
    let $unique= , 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
 }
 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
 #
 if ($more_pk_ui_tests)
@@ -75,42 +75,42 @@ if ($more_pk_ui_tests)
    let $alter= ALTER TABLE t1 MODIFY f_int1 BIGINT;
    --echo #  1.2.1 no PRIMARY KEY or UNIQUE INDEX exists
    let $unique= ;
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
-   --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.2 PRIMARY KEY exists
       let $unique= , 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
       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
-      --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_11.inc
+      --source suite/parts/inc/partition_alter_11.inc
       # --source include/partition_alter_11.inc
-      --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.3 UNIQUE INDEX exists
    let $unique= , UNIQUE INDEX uidx (f_int1);
-   --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 uidx (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
-   --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 uidx (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
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
 }
 #
@@ -123,9 +123,9 @@ if ($more_pk_ui_tests)
 let $alter= ALTER TABLE t1 MODIFY f_int1 BIGINT, MODIFY f_int2 BIGINT;
 --echo #  1.3.1 no PRIMARY KEY or UNIQUE INDEX exists
 let $unique= ;
---source suite/partitions/include/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_11.inc
 # --source include/partition_alter_11.inc
---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)
@@ -136,18 +136,18 @@ if ($do_pk_tests)
    if ($more_pk_ui_tests)
    {
       let $unique= , 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
    }
    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
-   --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_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
 }
 #
@@ -157,18 +157,18 @@ if ($do_pk_tests)
 if ($more_pk_ui_tests)
 {
    let $unique= , UNIQUE INDEX uidx (f_int1);
-   --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 uidx (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
---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 uidx (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
---source suite/partitions/include/partition_alter_13.inc
+--source suite/parts/inc/partition_alter_13.inc
 # --source include/partition_alter_13.inc
 
 --echo
@@ -184,7 +184,7 @@ let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
 let $alter= ALTER TABLE t1 MODIFY f_int2 MEDIUMINT;
 --echo #  2.1.1 no PRIMARY KEY or UNIQUE INDEX exists
 let $unique= ;
---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)
@@ -195,14 +195,14 @@ if ($do_pk_tests)
    {
       --echo #  2.1.2 PRIMARY KEY exists
       let $unique= , 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
    }
    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
 }
 #
@@ -212,14 +212,14 @@ if ($do_pk_tests)
 if ($more_pk_ui_tests)
 {
    let $unique= , 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
 }
 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
 #
 if ($more_pk_ui_tests)
@@ -233,42 +233,42 @@ if ($more_pk_ui_tests)
    let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT;
    --echo #  2.2.1 no PRIMARY KEY or UNIQUE INDEX exists
    let $unique= ;
-   --source suite/partitions/include/partition_alter_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
-   --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 #  2.2.2 PRIMARY KEY exists
       let $unique= , 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
       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
-      --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_11.inc
+      --source suite/parts/inc/partition_alter_11.inc
       # --source include/partition_alter_11.inc
-      --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.3 UNIQUE INDEX exists
    let $unique= , UNIQUE INDEX uidx (f_int1);
-   --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 uidx (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
-   --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 uidx (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
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
          # --source include/partition_alter_13.inc
 }
 #
@@ -280,9 +280,9 @@ if ($more_pk_ui_tests)
 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/partitions/include/partition_alter_11.inc
+--source suite/parts/inc/partition_alter_11.inc
 # --source include/partition_alter_11.inc
---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)
@@ -293,18 +293,18 @@ if ($do_pk_tests)
    if ($more_pk_ui_tests)
    {
       let $unique= , 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
    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
-   --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_11.inc
+   --source suite/parts/inc/partition_alter_11.inc
    # --source include/partition_alter_11.inc
-   --source suite/partitions/include/partition_alter_13.inc
+   --source suite/parts/inc/partition_alter_13.inc
    # --source include/partition_alter_13.inc
 }
 #
@@ -314,18 +314,18 @@ if ($do_pk_tests)
 if ($more_pk_ui_tests)
 {
    let $unique= , UNIQUE INDEX uidx (f_int1);
-   --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 uidx (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
---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 uidx (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
---source suite/partitions/include/partition_alter_13.inc
+--source suite/parts/inc/partition_alter_13.inc
 # --source include/partition_alter_13.inc
 #
 
diff --git a/mysql-test/suite/partitions/include/partition_alter3.inc b/mysql-test/suite/parts/inc/partition_alter3.inc
index 3ff1754872e..48ad61ebe08 100644
--- a/mysql-test/suite/partitions/include/partition_alter3.inc
+++ b/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
 
diff --git a/mysql-test/suite/partitions/include/partition_alter4.inc b/mysql-test/suite/parts/inc/partition_alter4.inc
index e942d8d0e1f..e6f5dadbcca 100644
--- a/mysql-test/suite/partitions/include/partition_alter4.inc
+++ b/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
 
diff --git a/mysql-test/suite/partitions/include/partition_alter_1.inc b/mysql-test/suite/parts/inc/partition_alter_1.inc
index 22556ccb085..542a67ccbef 100644
--- a/mysql-test/suite/partitions/include/partition_alter_1.inc
+++ b/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;
diff --git a/mysql-test/suite/partitions/include/partition_alter_11.inc b/mysql-test/suite/parts/inc/partition_alter_11.inc
index 606667054fd..f26d8e822ae 100644
--- a/mysql-test/suite/partitions/include/partition_alter_11.inc
+++ b/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
diff --git a/mysql-test/suite/partitions/include/partition_alter_13.inc b/mysql-test/suite/parts/inc/partition_alter_13.inc
index be12fab6054..5152230795a 100644
--- a/mysql-test/suite/partitions/include/partition_alter_13.inc
+++ b/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
diff --git a/mysql-test/suite/partitions/include/partition_alter_41.inc b/mysql-test/suite/parts/inc/partition_alter_41.inc
index 856d04cf151..303ec8c2062 100644
--- a/mysql-test/suite/partitions/include/partition_alter_41.inc
+++ b/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
diff --git a/mysql-test/suite/partitions/include/partition_basic.inc b/mysql-test/suite/parts/inc/partition_basic.inc
index 19311070a47..9854edab634 100644
--- a/mysql-test/suite/partitions/include/partition_basic.inc
+++ b/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
diff --git a/mysql-test/suite/partitions/include/partition_bigint.inc b/mysql-test/suite/parts/inc/partition_bigint.inc
index f7d22ce17d1..f7d22ce17d1 100644
--- a/mysql-test/suite/partitions/include/partition_bigint.inc
+++ b/mysql-test/suite/parts/inc/partition_bigint.inc
diff --git a/mysql-test/suite/partitions/include/partition_binary.inc b/mysql-test/suite/parts/inc/partition_binary.inc
index 7243d6c2ce7..7243d6c2ce7 100644
--- a/mysql-test/suite/partitions/include/partition_binary.inc
+++ b/mysql-test/suite/parts/inc/partition_binary.inc
diff --git a/mysql-test/suite/partitions/include/partition_bit.inc b/mysql-test/suite/parts/inc/partition_bit.inc
index 3dd880595a3..3dd880595a3 100644
--- a/mysql-test/suite/partitions/include/partition_bit.inc
+++ b/mysql-test/suite/parts/inc/partition_bit.inc
diff --git a/mysql-test/suite/partitions/include/partition_blob.inc b/mysql-test/suite/parts/inc/partition_blob.inc
index ccff06ba633..ccff06ba633 100644
--- a/mysql-test/suite/partitions/include/partition_blob.inc
+++ b/mysql-test/suite/parts/inc/partition_blob.inc
diff --git a/mysql-test/suite/partitions/include/partition_blocked_sql_funcs.inc b/mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc
index 7843a44134c..7843a44134c 100644
--- a/mysql-test/suite/partitions/include/partition_blocked_sql_funcs.inc
+++ b/mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc
diff --git a/mysql-test/suite/partitions/include/partition_char.inc b/mysql-test/suite/parts/inc/partition_char.inc
index 4e330b122e3..4e330b122e3 100644
--- a/mysql-test/suite/partitions/include/partition_char.inc
+++ b/mysql-test/suite/parts/inc/partition_char.inc
diff --git a/mysql-test/suite/partitions/include/partition_check.inc b/mysql-test/suite/parts/inc/partition_check.inc
index 61266939bf5..698e9611af1 100644
--- a/mysql-test/suite/partitions/include/partition_check.inc
+++ b/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)
 
diff --git a/mysql-test/suite/partitions/include/partition_check_drop.inc b/mysql-test/suite/parts/inc/partition_check_drop.inc
index 825ebecba24..825ebecba24 100644
--- a/mysql-test/suite/partitions/include/partition_check_drop.inc
+++ b/mysql-test/suite/parts/inc/partition_check_drop.inc
diff --git a/mysql-test/suite/partitions/include/partition_check_read.inc b/mysql-test/suite/parts/inc/partition_check_read.inc
index 14bbd46ac7f..14bbd46ac7f 100644
--- a/mysql-test/suite/partitions/include/partition_check_read.inc
+++ b/mysql-test/suite/parts/inc/partition_check_read.inc
diff --git a/mysql-test/suite/partitions/include/partition_check_read1.inc b/mysql-test/suite/parts/inc/partition_check_read1.inc
index dad5c347052..dad5c347052 100644
--- a/mysql-test/suite/partitions/include/partition_check_read1.inc
+++ b/mysql-test/suite/parts/inc/partition_check_read1.inc
diff --git a/mysql-test/suite/partitions/include/partition_check_read2.inc b/mysql-test/suite/parts/inc/partition_check_read2.inc
index 4c32456a31e..4c32456a31e 100644
--- a/mysql-test/suite/partitions/include/partition_check_read2.inc
+++ b/mysql-test/suite/parts/inc/partition_check_read2.inc
diff --git a/mysql-test/suite/partitions/include/partition_cleanup.inc b/mysql-test/suite/parts/inc/partition_cleanup.inc
index dcd6005287e..dcd6005287e 100644
--- a/mysql-test/suite/partitions/include/partition_cleanup.inc
+++ b/mysql-test/suite/parts/inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/include/partition_date.inc b/mysql-test/suite/parts/inc/partition_date.inc
index b58a7598236..b58a7598236 100644
--- a/mysql-test/suite/partitions/include/partition_date.inc
+++ b/mysql-test/suite/parts/inc/partition_date.inc
diff --git a/mysql-test/suite/partitions/include/partition_datetime.inc b/mysql-test/suite/parts/inc/partition_datetime.inc
index 94c9d3d75da..94c9d3d75da 100644
--- a/mysql-test/suite/partitions/include/partition_datetime.inc
+++ b/mysql-test/suite/parts/inc/partition_datetime.inc
diff --git a/mysql-test/suite/partitions/include/partition_decimal.inc b/mysql-test/suite/parts/inc/partition_decimal.inc
index eb35416f395..eb35416f395 100644
--- a/mysql-test/suite/partitions/include/partition_decimal.inc
+++ b/mysql-test/suite/parts/inc/partition_decimal.inc
diff --git a/mysql-test/suite/partitions/include/partition_directory.inc b/mysql-test/suite/parts/inc/partition_directory.inc
index 24077cd80fd..2c765e1f5ab 100644
--- a/mysql-test/suite/partitions/include/partition_directory.inc
+++ b/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;
 
diff --git a/mysql-test/suite/partitions/include/partition_double.inc b/mysql-test/suite/parts/inc/partition_double.inc
index 96cf7fd4871..96cf7fd4871 100644
--- a/mysql-test/suite/partitions/include/partition_double.inc
+++ b/mysql-test/suite/parts/inc/partition_double.inc
diff --git a/mysql-test/suite/partitions/include/partition_engine.inc b/mysql-test/suite/parts/inc/partition_engine.inc
index 05a0a0bcd71..2beb08e7626 100644
--- a/mysql-test/suite/partitions/include/partition_engine.inc
+++ b/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;
diff --git a/mysql-test/suite/partitions/include/partition_enum.inc b/mysql-test/suite/parts/inc/partition_enum.inc
index f8fcb1110ae..f8fcb1110ae 100644
--- a/mysql-test/suite/partitions/include/partition_enum.inc
+++ b/mysql-test/suite/parts/inc/partition_enum.inc
diff --git a/mysql-test/suite/partitions/include/partition_float.inc b/mysql-test/suite/parts/inc/partition_float.inc
index 25c59a10153..25c59a10153 100644
--- a/mysql-test/suite/partitions/include/partition_float.inc
+++ b/mysql-test/suite/parts/inc/partition_float.inc
diff --git a/mysql-test/suite/partitions/include/partition_int.inc b/mysql-test/suite/parts/inc/partition_int.inc
index 7f019c96b94..7f019c96b94 100644
--- a/mysql-test/suite/partitions/include/partition_int.inc
+++ b/mysql-test/suite/parts/inc/partition_int.inc
diff --git a/mysql-test/suite/partitions/include/partition_key_16col.inc b/mysql-test/suite/parts/inc/partition_key_16col.inc
index 5f97d5d0f71..5f97d5d0f71 100644
--- a/mysql-test/suite/partitions/include/partition_key_16col.inc
+++ b/mysql-test/suite/parts/inc/partition_key_16col.inc
diff --git a/mysql-test/suite/partitions/include/partition_key_32col.inc b/mysql-test/suite/parts/inc/partition_key_32col.inc
index 90a36d2a228..90a36d2a228 100644
--- a/mysql-test/suite/partitions/include/partition_key_32col.inc
+++ b/mysql-test/suite/parts/inc/partition_key_32col.inc
diff --git a/mysql-test/suite/partitions/include/partition_key_4col.inc b/mysql-test/suite/parts/inc/partition_key_4col.inc
index c5d1452080f..c5d1452080f 100644
--- a/mysql-test/suite/partitions/include/partition_key_4col.inc
+++ b/mysql-test/suite/parts/inc/partition_key_4col.inc
diff --git a/mysql-test/suite/partitions/include/partition_key_8col.inc b/mysql-test/suite/parts/inc/partition_key_8col.inc
index a0d2e1532f3..a0d2e1532f3 100644
--- a/mysql-test/suite/partitions/include/partition_key_8col.inc
+++ b/mysql-test/suite/parts/inc/partition_key_8col.inc
diff --git a/mysql-test/suite/partitions/include/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc
index fe0d9d138a0..fe0d9d138a0 100644
--- a/mysql-test/suite/partitions/include/partition_layout_check1.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc
diff --git a/mysql-test/suite/partitions/include/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc
index c28387cccd0..c28387cccd0 100644
--- a/mysql-test/suite/partitions/include/partition_layout_check2.inc
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc
diff --git a/mysql-test/suite/partitions/include/partition_mediumint.inc b/mysql-test/suite/parts/inc/partition_mediumint.inc
index 18bfedf7ed9..18bfedf7ed9 100644
--- a/mysql-test/suite/partitions/include/partition_mediumint.inc
+++ b/mysql-test/suite/parts/inc/partition_mediumint.inc
diff --git a/mysql-test/suite/partitions/include/partition_methods1.inc b/mysql-test/suite/parts/inc/partition_methods1.inc
index 674bae4d809..bec0c747f28 100644
--- a/mysql-test/suite/partitions/include/partition_methods1.inc
+++ b/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;
diff --git a/mysql-test/suite/partitions/include/partition_methods2.inc b/mysql-test/suite/parts/inc/partition_methods2.inc
index 2b632652609..31b083bfa7a 100644
--- a/mysql-test/suite/partitions/include/partition_methods2.inc
+++ b/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;
diff --git a/mysql-test/suite/partitions/include/partition_set.inc b/mysql-test/suite/parts/inc/partition_set.inc
index 76fc1aea4ba..76fc1aea4ba 100644
--- a/mysql-test/suite/partitions/include/partition_set.inc
+++ b/mysql-test/suite/parts/inc/partition_set.inc
diff --git a/mysql-test/suite/partitions/include/partition_smallint.inc b/mysql-test/suite/parts/inc/partition_smallint.inc
index c594cd4c26c..c594cd4c26c 100644
--- a/mysql-test/suite/partitions/include/partition_smallint.inc
+++ b/mysql-test/suite/parts/inc/partition_smallint.inc
diff --git a/mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
index b2e102f8e07..a26e6650893 100644
--- a/mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc
+++ b/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 -------------------------
diff --git a/mysql-test/suite/partitions/include/partition_syntax.inc b/mysql-test/suite/parts/inc/partition_syntax.inc
index 6b28d05e153..3c53861b95b 100644
--- a/mysql-test/suite/partitions/include/partition_syntax.inc
+++ b/mysql-test/suite/parts/inc/partition_syntax.inc
@@ -106,17 +106,17 @@ let $unique_index= UNIQUE INDEX (f_int2);
 
 #----------- PARTITION BY HASH
 let $partition_scheme= PARTITION BY HASH(f_int1) PARTITIONS 2;
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 let $partition_scheme= PARTITION BY HASH(f_int1 + f_int2) PARTITIONS 2;
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 #----------- PARTITION BY KEY
 let $partition_scheme= PARTITION BY KEY(f_int1) PARTITIONS 2;
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 let $partition_scheme= PARTITION BY KEY(f_int1,f_int2) PARTITIONS 2;
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 #----------- PARTITION BY LIST
 let $partition_scheme= PARTITION BY LIST(MOD(f_int1,3))
@@ -124,25 +124,25 @@ let $partition_scheme= PARTITION BY LIST(MOD(f_int1,3))
     PARTITION part0 VALUES IN (0),
     PARTITION part1 VALUES IN (1),
     PARTITION part2 VALUES IN (2));
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 let $partition_scheme= PARTITION BY LIST(MOD(f_int1 + f_int2,3))
    (PARTITION partN VALUES IN (NULL),
     PARTITION part0 VALUES IN (0),
     PARTITION part1 VALUES IN (1),
     PARTITION part2 VALUES IN (2));
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 #----------- PARTITION BY RANGE
 let $partition_scheme= PARTITION BY RANGE(f_int1)
    (PARTITION part1 VALUES LESS THAN (1),
     PARTITION part2 VALUES LESS THAN (2147483646));
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 let $partition_scheme= PARTITION BY RANGE(f_int1 + f_int2)
    (PARTITION part1 VALUES LESS THAN (1),
     PARTITION part2 VALUES LESS THAN (2147483646));
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 
 #
@@ -199,14 +199,14 @@ let $partition_scheme= PARTITION BY RANGE(f_int2)
 SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 3
    (PARTITION part1 VALUES LESS THAN (1),
     PARTITION part2 VALUES LESS THAN (2147483646));
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 let $partition_scheme= PARTITION BY RANGE(f_int2)
 SUBPARTITION BY KEY(f_int1) SUBPARTITIONS 3
    (PARTITION part1 VALUES LESS THAN (1),
     PARTITION part2 VALUES LESS THAN (2147483646));
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
 let $partition_scheme= PARTITION BY LIST(MOD(f_int2,3))
@@ -215,7 +215,7 @@ SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 2
     PARTITION part0 VALUES IN (0),
     PARTITION part1 VALUES IN (1),
     PARTITION part2 VALUES IN (2));
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
 let $partition_scheme= PARTITION BY LIST(MOD(f_int2,3))
@@ -224,7 +224,7 @@ SUBPARTITION BY KEY(f_int1) SUBPARTITIONS 2
     PARTITION part0 VALUES IN (0),
     PARTITION part1 VALUES IN (1),
     PARTITION part2 VALUES IN (2));
---source suite/partitions/include/partition_syntax_2.inc
+--source suite/parts/inc/partition_syntax_2.inc
 # --source include/partition_syntax_2.inc
 
 --echo
@@ -358,7 +358,7 @@ $column_list
 PARTITION BY LIST(MOD(f_int1,2))
 ( PARTITION part1 VALUES IN (CAST(NULL AS SIGNED INTEGER)),
   PARTITION part3 VALUES IN (1));
---source suite/partitions/include/partition_layout_check1.inc
+--source suite/parts/inc/partition_layout_check1.inc
 # --source include/partition_layout_check1.inc
 DROP TABLE t1;
 --echo #  3.5.3 Reveal that IN (...NULL) is not mapped to IN(0)
@@ -371,7 +371,7 @@ PARTITION BY LIST(MOD(f_int1,2))
 ( PARTITION part1 VALUES IN (CAST(NULL AS SIGNED INTEGER)),
   PARTITION part2 VALUES IN (0),
   PARTITION part3 VALUES IN (1));
---source suite/partitions/include/partition_layout_check1.inc
+--source suite/parts/inc/partition_layout_check1.inc
 # --source include/partition_layout_check1.inc
 DROP TABLE t1;
 
@@ -394,7 +394,7 @@ eval CREATE TABLE t1 (
 $column_list
 )
 PARTITION BY HASH(f_int1);
---source suite/partitions/include/partition_layout_check1.inc
+--source suite/parts/inc/partition_layout_check1.inc
 # --source include/partition_layout_check1.inc
 DROP TABLE t1;
 --echo # 4.1.2 no partition number, named partitions
@@ -402,7 +402,7 @@ eval CREATE TABLE t1 (
 $column_list
 )
 PARTITION BY HASH(f_int1) (PARTITION part1, PARTITION part2);
---source suite/partitions/include/partition_layout_check1.inc
+--source suite/parts/inc/partition_layout_check1.inc
 # --source include/partition_layout_check1.inc
 DROP TABLE t1;
 # Attention: Several combinations are impossible
@@ -469,7 +469,7 @@ eval $part01 $column_list $part02 $part1_Y $part2_N $part3_Y ;
 --error 1064
 eval $part01 $column_list $part02 $part1_Y $part2_Y $part3_N ;
 eval $part01 $column_list $part02 $part1_Y $part2_Y $part3_Y ;
---source suite/partitions/include/partition_layout_check1.inc
+--source suite/parts/inc/partition_layout_check1.inc
 # --source include/partition_layout_check1.inc
 DROP TABLE t1;
 
@@ -484,95 +484,95 @@ DROP TABLE IF EXISTS t1;
 #     with the server response.
 # (positive) number = 2
 let $part_number= 2;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (positive) special case number = 1
 let $part_number= 1;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) 0 is non sense
 let $part_number= 0;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) -1 is non sense
 let $part_number= -1;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) 1000000 is too huge
 let $part_number= 1000000;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 
 --echo # 4.2.2 partition/subpartition numbers DECIMAL notation
 # (positive) number = 2.0
 let $part_number= 2.0;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) -2.0 is non sense
 let $part_number= -2.0;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) case number = 0.0 is non sense
 let $part_number= 0.0;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 if ($fixed_bug15890)
 {
 # Bug#15890 Partitions: Strange interpretation of partition number
 # (negative) number = 1.6 is non sense
 let $part_number= 1.6;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 }
 # (negative) number is too huge
 let $part_number= 999999999999999999999999999999.999999999999999999999999999999;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) number is nearly zero
 let $part_number= 0.000000000000000000000000000001;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 
 --echo # 4.2.3 partition/subpartition numbers FLOAT notation
 ##### FLOAT notation
 # (positive) number = 2.0E+0
 let $part_number= 2.0E+0;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 if ($fixed_bug15890)
 {
 # Bug#15890 Partitions: Strange interpretation of partition number
 # (positive) number = 0.2E+1
 let $part_number= 0.2E+1;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 }
 # (negative) -2.0E+0 is non sense
 let $part_number= -2.0E+0;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 if ($fixed_bug15890)
 {
 # Bug#15890 Partitions: Strange interpretation of partition number
 # (negative) 0.16E+1 is non sense
 let $part_number= 0.16E+1;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 }
 # (negative) 0.0E+300 is zero
 let $part_number= 0.0E+300;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 if ($fixed_bug15890)
 {
 # Bug#15890 Partitions: Strange interpretation of partition number
 # (negative) 1E+300 is too huge
 let $part_number= 1E+300;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) 1E-300 is nearly zero
 let $part_number= 1E-300;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 }
 
@@ -580,62 +580,62 @@ let $part_number= 1E-300;
 ##### STRING notation
 # (negative?) case number = '2'
 let $part_number= '2';
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative?) case number = '2.0'
 let $part_number= '2.0';
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative?) case number = '0.2E+1'
 let $part_number= '0.2E+1';
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) Strings starts with digit, but 'A' follows
 let $part_number= '2A';
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) Strings starts with 'A', but digit follows
 let $part_number= 'A2';
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) empty string
 let $part_number= '';
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) string without any digits
 let $part_number= 'GARBAGE';
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 
 --echo # 4.2.5 partition/subpartition numbers other notations
 # (negative) Strings starts with digit, but 'A' follows
 let $part_number= 2A;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) Strings starts with 'A', but digit follows
 let $part_number= A2;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) string without any digits
 let $part_number= GARBAGE;
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 
 # (negative?) double quotes
 let $part_number= "2";
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) Strings starts with digit, but 'A' follows
 let $part_number= "2A";
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) Strings starts with 'A', but digit follows
 let $part_number= "A2";
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 # (negative) string without any digits
 let $part_number= "GARBAGE";
---source suite/partitions/include/partition_syntax_1.inc
+--source suite/parts/inc/partition_syntax_1.inc
 # --source include/partition_syntax_1.inc
 
 --echo # 4.2.6 (negative) partition/subpartition numbers per @variables
@@ -664,7 +664,7 @@ eval CREATE TABLE t1 (
 $column_list
 )
 PARTITION BY HASH(f_int1) PARTITIONS 2 ( PARTITION part1, PARTITION part2 ) ;
---source suite/partitions/include/partition_layout_check1.inc
+--source suite/parts/inc/partition_layout_check1.inc
 # --source include/partition_layout_check1.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
@@ -677,7 +677,7 @@ SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 2
   PARTITION part2 VALUES LESS THAN $MAX_VALUE
     (SUBPARTITION subpart21, SUBPARTITION subpart22)
 );
---source suite/partitions/include/partition_layout_check1.inc
+--source suite/parts/inc/partition_layout_check1.inc
 # --source include/partition_layout_check1.inc
 DROP TABLE t1;
 --echo # 4.3.2 (positive) number of partition/subpartition ,
diff --git a/mysql-test/suite/partitions/include/partition_syntax_1.inc b/mysql-test/suite/parts/inc/partition_syntax_1.inc
index c9ec8ba1263..ac88b5ee668 100644
--- a/mysql-test/suite/partitions/include/partition_syntax_1.inc
+++ b/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;
 }
diff --git a/mysql-test/suite/partitions/include/partition_syntax_2.inc b/mysql-test/suite/parts/inc/partition_syntax_2.inc
index 26a3c90b92f..9adf1c9b2a0 100644
--- a/mysql-test/suite/partitions/include/partition_syntax_2.inc
+++ b/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;
diff --git a/mysql-test/suite/partitions/include/partition_text.inc b/mysql-test/suite/parts/inc/partition_text.inc
index a655552c457..a655552c457 100644
--- a/mysql-test/suite/partitions/include/partition_text.inc
+++ b/mysql-test/suite/parts/inc/partition_text.inc
diff --git a/mysql-test/suite/partitions/include/partition_time.inc b/mysql-test/suite/parts/inc/partition_time.inc
index a3388bdc902..a3388bdc902 100644
--- a/mysql-test/suite/partitions/include/partition_time.inc
+++ b/mysql-test/suite/parts/inc/partition_time.inc
diff --git a/mysql-test/suite/partitions/include/partition_timestamp.inc b/mysql-test/suite/parts/inc/partition_timestamp.inc
index 44eb3b5bd55..44eb3b5bd55 100644
--- a/mysql-test/suite/partitions/include/partition_timestamp.inc
+++ b/mysql-test/suite/parts/inc/partition_timestamp.inc
diff --git a/mysql-test/suite/partitions/include/partition_tinyint.inc b/mysql-test/suite/parts/inc/partition_tinyint.inc
index a1f8874e794..a1f8874e794 100644
--- a/mysql-test/suite/partitions/include/partition_tinyint.inc
+++ b/mysql-test/suite/parts/inc/partition_tinyint.inc
diff --git a/mysql-test/suite/partitions/include/partition_trigg1.inc b/mysql-test/suite/parts/inc/partition_trigg1.inc
index 7ebf2f411d3..7ebf2f411d3 100644
--- a/mysql-test/suite/partitions/include/partition_trigg1.inc
+++ b/mysql-test/suite/parts/inc/partition_trigg1.inc
diff --git a/mysql-test/suite/partitions/include/partition_trigg2.inc b/mysql-test/suite/parts/inc/partition_trigg2.inc
index 767dbd52e47..767dbd52e47 100644
--- a/mysql-test/suite/partitions/include/partition_trigg2.inc
+++ b/mysql-test/suite/parts/inc/partition_trigg2.inc
diff --git a/mysql-test/suite/partitions/include/partition_trigg3.inc b/mysql-test/suite/parts/inc/partition_trigg3.inc
index a129cf75a1d..a129cf75a1d 100644
--- a/mysql-test/suite/partitions/include/partition_trigg3.inc
+++ b/mysql-test/suite/parts/inc/partition_trigg3.inc
diff --git a/mysql-test/suite/partitions/include/partition_value.inc b/mysql-test/suite/parts/inc/partition_value.inc
index 75e9afd53d3..75e9afd53d3 100644
--- a/mysql-test/suite/partitions/include/partition_value.inc
+++ b/mysql-test/suite/parts/inc/partition_value.inc
diff --git a/mysql-test/suite/partitions/include/partition_varbinary.inc b/mysql-test/suite/parts/inc/partition_varbinary.inc
index b112cbe312e..b112cbe312e 100644
--- a/mysql-test/suite/partitions/include/partition_varbinary.inc
+++ b/mysql-test/suite/parts/inc/partition_varbinary.inc
diff --git a/mysql-test/suite/partitions/include/partition_varchar.inc b/mysql-test/suite/parts/inc/partition_varchar.inc
index 1cd33fa49da..1cd33fa49da 100644
--- a/mysql-test/suite/partitions/include/partition_varchar.inc
+++ b/mysql-test/suite/parts/inc/partition_varchar.inc
diff --git a/mysql-test/suite/partitions/include/partition_year.inc b/mysql-test/suite/parts/inc/partition_year.inc
index 2643380702e..2643380702e 100644
--- a/mysql-test/suite/partitions/include/partition_year.inc
+++ b/mysql-test/suite/parts/inc/partition_year.inc
diff --git a/mysql-test/suite/partitions/r/ndb_blob_partition.result b/mysql-test/suite/parts/r/ndb_blob_partition.result
index b08a91f0cdd..b08a91f0cdd 100644
--- a/mysql-test/suite/partitions/r/ndb_blob_partition.result
+++ b/mysql-test/suite/parts/r/ndb_blob_partition.result
diff --git a/mysql-test/suite/partitions/r/ndb_dd_backuprestore.result b/mysql-test/suite/parts/r/ndb_dd_backuprestore.result
index e7568e4ce49..e7568e4ce49 100644
--- a/mysql-test/suite/partitions/r/ndb_dd_backuprestore.result
+++ b/mysql-test/suite/parts/r/ndb_dd_backuprestore.result
diff --git a/mysql-test/suite/partitions/r/ndb_partition_error.result b/mysql-test/suite/parts/r/ndb_partition_error.result
index d86dc382185..d86dc382185 100644
--- a/mysql-test/suite/partitions/r/ndb_partition_error.result
+++ b/mysql-test/suite/parts/r/ndb_partition_error.result
diff --git a/mysql-test/suite/partitions/r/ndb_partition_key.result b/mysql-test/suite/parts/r/ndb_partition_key.result
index 49fe8181237..daac61fb530 100644
--- a/mysql-test/suite/partitions/r/ndb_partition_key.result
+++ b/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
diff --git a/mysql-test/suite/partitions/r/ndb_partition_list.result b/mysql-test/suite/parts/r/ndb_partition_list.result
index ce2574ddcc4..ce2574ddcc4 100644
--- a/mysql-test/suite/partitions/r/ndb_partition_list.result
+++ b/mysql-test/suite/parts/r/ndb_partition_list.result
diff --git a/mysql-test/suite/partitions/r/ndb_partition_range.result b/mysql-test/suite/parts/r/ndb_partition_range.result
index cb79f04873e..cb79f04873e 100644
--- a/mysql-test/suite/partitions/r/ndb_partition_range.result
+++ b/mysql-test/suite/parts/r/ndb_partition_range.result
diff --git a/mysql-test/suite/partitions/r/partition_blocked_sql_func_innodb.result b/mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result
index 675cebaa7e3..675cebaa7e3 100644
--- a/mysql-test/suite/partitions/r/partition_blocked_sql_func_innodb.result
+++ b/mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_blocked_sql_func_myisam.result b/mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result
index 8b0ea1d3d49..8b0ea1d3d49 100644
--- a/mysql-test/suite/partitions/r/partition_blocked_sql_func_myisam.result
+++ b/mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_supported_sql_func_innodb.result b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
index 196f7930bb0..1e158e0a787 100644
--- a/mysql-test/suite/partitions/r/partition_supported_sql_func_innodb.result
+++ b/mysql-test/suite/parts/r/part_supported_sql_func_innodb.result
@@ -55,9 +55,9 @@ insert into t2 values (17 );
 insert into t3 values (5 );
 insert into t3 values (13 );
 insert into t3 values (17 );
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_int.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_int.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_int.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_int.inc' into table t6;
 select abs(col1) from t1 order by col1;
 abs(col1)
 5
@@ -1731,9 +1731,9 @@ insert into t2 values ('3');
 insert into t3 values ('1');
 insert into t3 values ('9');
 insert into t3 values ('3');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t6;
 select ascii(col1) from t1 order by col1;
 ascii(col1)
 49
@@ -2231,9 +2231,9 @@ insert into t2 values (17.987);
 insert into t3 values (5.1230);
 insert into t3 values (13.345);
 insert into t3 values (17.987);
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t6;
 select cast(ceiling(col1) as signed integer) from t1 order by col1;
 cast(ceiling(col1) as signed integer)
 6
@@ -2729,9 +2729,9 @@ insert into t2 values (17.987);
 insert into t3 values (5.1230);
 insert into t3 values (13.345);
 insert into t3 values (17.987);
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t6;
 select cast(floor(col1) as signed) from t1 order by col1;
 cast(floor(col1) as signed)
 5
@@ -3227,9 +3227,9 @@ insert into t2 values (17);
 insert into t3 values (5.0000);
 insert into t3 values (19);
 insert into t3 values (17);
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t6;
 select cast(mod(col1,10) as signed) from t1 order by col1;
 cast(mod(col1,10) as signed)
 5
@@ -3727,9 +3727,9 @@ insert into t2 values ('3');
 insert into t3 values ('1');
 insert into t3 values ('9');
 insert into t3 values ('3');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t6;
 select ord(col1) from t1 order by col1;
 ord(col1)
 49
@@ -4225,9 +4225,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select day(col1) from t1 order by col1;
 day(col1)
 17
@@ -4721,9 +4721,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofmonth(col1) from t1 order by col1;
 dayofmonth(col1)
 17
@@ -5217,9 +5217,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofweek(col1) from t1 order by col1;
 dayofweek(col1)
 3
@@ -5725,9 +5725,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -6223,9 +6223,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -6721,9 +6721,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select extract(month from col1) from t1 order by col1;
 extract(month from col1)
 1
@@ -7219,9 +7219,9 @@ insert into t2 values ('21:59');
 insert into t3 values ('09:09');
 insert into t3 values ('14:30');
 insert into t3 values ('21:59');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select hour(col1) from t1 order by col1;
 hour(col1)
 9
@@ -7723,9 +7723,9 @@ insert into t2 values ('00:59:22.000024');
 insert into t3 values ('09:09:15.000002');
 insert into t3 values ('04:30:01.000018');
 insert into t3 values ('00:59:22.000024');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select microsecond(col1) from t1 order by col1;
 microsecond(col1)
 0
@@ -8213,9 +8213,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select minute(col1) from t1 order by col1;
 minute(col1)
 9
@@ -8723,9 +8723,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -9233,9 +9233,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -9743,9 +9743,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-05-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select month(col1) from t1 order by col1;
 month(col1)
 1
@@ -10247,9 +10247,9 @@ insert into t2 values ('2006-09-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-09-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select quarter(col1) from t1 order by col1;
 quarter(col1)
 1
@@ -10749,9 +10749,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select time_to_sec(col1)-(time_to_sec(col1)-20) from t1 order by col1;
 time_to_sec(col1)-(time_to_sec(col1)-20)
 20
@@ -11257,9 +11257,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select to_days(col1)-to_days('2006-01-01') from t1 order by col1;
 to_days(col1)-to_days('2006-01-01')
 16
@@ -11757,9 +11757,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-12-03');
 insert into t3 values ('2006-11-17');
 insert into t3 values ('2006-05-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select weekday(col1) from t1 order by col1;
 weekday(col1)
 4
@@ -12257,9 +12257,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-03-17');
 insert into t3 values ('2006-05-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select weekofyear(col1) from t1 order by col1;
 weekofyear(col1)
 1
@@ -12765,9 +12765,9 @@ insert into t2 values ('2004-05-25');
 insert into t3 values ('1996-01-03');
 insert into t3 values ('2000-02-17');
 insert into t3 values ('2004-05-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select year(col1)-1990 from t1 order by col1;
 year(col1)-1990
 6
@@ -13269,9 +13269,9 @@ insert into t2 values ('2006-03-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-08-17');
 insert into t3 values ('2006-03-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select yearweek(col1)-200600 from t1 order by col1;
 yearweek(col1)-200600
 1
diff --git a/mysql-test/suite/partitions/r/partition_supported_sql_func_myisam.result b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
index 86742038990..3e668139c7d 100644
--- a/mysql-test/suite/partitions/r/partition_supported_sql_func_myisam.result
+++ b/mysql-test/suite/parts/r/part_supported_sql_func_myisam.result
@@ -55,9 +55,9 @@ insert into t2 values (17 );
 insert into t3 values (5 );
 insert into t3 values (13 );
 insert into t3 values (17 );
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_int.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_int.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_int.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_int.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_int.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_int.inc' into table t6;
 select abs(col1) from t1 order by col1;
 abs(col1)
 5
@@ -1731,9 +1731,9 @@ insert into t2 values ('3');
 insert into t3 values ('1');
 insert into t3 values ('9');
 insert into t3 values ('3');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t6;
 select ascii(col1) from t1 order by col1;
 ascii(col1)
 49
@@ -2231,9 +2231,9 @@ insert into t2 values (17.987);
 insert into t3 values (5.1230);
 insert into t3 values (13.345);
 insert into t3 values (17.987);
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t6;
 select cast(ceiling(col1) as signed integer) from t1 order by col1;
 cast(ceiling(col1) as signed integer)
 6
@@ -2729,9 +2729,9 @@ insert into t2 values (17.987);
 insert into t3 values (5.1230);
 insert into t3 values (13.345);
 insert into t3 values (17.987);
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t6;
 select cast(floor(col1) as signed) from t1 order by col1;
 cast(floor(col1) as signed)
 5
@@ -3227,9 +3227,9 @@ insert into t2 values (17);
 insert into t3 values (5.0000);
 insert into t3 values (19);
 insert into t3 values (17);
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_float.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_float.inc' into table t6;
 select cast(mod(col1,10) as signed) from t1 order by col1;
 cast(mod(col1,10) as signed)
 5
@@ -3727,9 +3727,9 @@ insert into t2 values ('3');
 insert into t3 values ('1');
 insert into t3 values ('9');
 insert into t3 values ('3');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc' into table t6;
 select ord(col1) from t1 order by col1;
 ord(col1)
 49
@@ -4225,9 +4225,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select day(col1) from t1 order by col1;
 day(col1)
 17
@@ -4721,9 +4721,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofmonth(col1) from t1 order by col1;
 dayofmonth(col1)
 17
@@ -5217,9 +5217,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofweek(col1) from t1 order by col1;
 dayofweek(col1)
 3
@@ -5725,9 +5725,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -6223,9 +6223,9 @@ insert into t2 values ('2006-02-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-02-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -6721,9 +6721,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-02-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select extract(month from col1) from t1 order by col1;
 extract(month from col1)
 1
@@ -7219,9 +7219,9 @@ insert into t2 values ('21:59');
 insert into t3 values ('09:09');
 insert into t3 values ('14:30');
 insert into t3 values ('21:59');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select hour(col1) from t1 order by col1;
 hour(col1)
 9
@@ -7723,9 +7723,9 @@ insert into t2 values ('00:59:22.000024');
 insert into t3 values ('09:09:15.000002');
 insert into t3 values ('04:30:01.000018');
 insert into t3 values ('00:59:22.000024');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select microsecond(col1) from t1 order by col1;
 microsecond(col1)
 0
@@ -8213,9 +8213,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select minute(col1) from t1 order by col1;
 minute(col1)
 9
@@ -8723,9 +8723,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -9233,9 +9233,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:09');
 insert into t3 values ('14:30:20');
 insert into t3 values ('21:59:22');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -9743,9 +9743,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-05-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select month(col1) from t1 order by col1;
 month(col1)
 1
@@ -10247,9 +10247,9 @@ insert into t2 values ('2006-09-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-12-17');
 insert into t3 values ('2006-09-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select quarter(col1) from t1 order by col1;
 quarter(col1)
 1
@@ -10749,9 +10749,9 @@ insert into t2 values ('21:59:22');
 insert into t3 values ('09:09:15');
 insert into t3 values ('14:30:45');
 insert into t3 values ('21:59:22');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_time.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_time.inc' into table t6;
 select time_to_sec(col1)-(time_to_sec(col1)-20) from t1 order by col1;
 time_to_sec(col1)-(time_to_sec(col1)-20)
 20
@@ -11257,9 +11257,9 @@ insert into t2 values ('2006-01-25');
 insert into t3 values ('2006-02-03');
 insert into t3 values ('2006-01-17');
 insert into t3 values ('2006-01-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select to_days(col1)-to_days('2006-01-01') from t1 order by col1;
 to_days(col1)-to_days('2006-01-01')
 16
@@ -11757,9 +11757,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-12-03');
 insert into t3 values ('2006-11-17');
 insert into t3 values ('2006-05-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select weekday(col1) from t1 order by col1;
 weekday(col1)
 4
@@ -12257,9 +12257,9 @@ insert into t2 values ('2006-05-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-03-17');
 insert into t3 values ('2006-05-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select weekofyear(col1) from t1 order by col1;
 weekofyear(col1)
 1
@@ -12765,9 +12765,9 @@ insert into t2 values ('2004-05-25');
 insert into t3 values ('1996-01-03');
 insert into t3 values ('2000-02-17');
 insert into t3 values ('2004-05-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select year(col1)-1990 from t1 order by col1;
 year(col1)-1990
 6
@@ -13269,9 +13269,9 @@ insert into t2 values ('2006-03-25');
 insert into t3 values ('2006-01-03');
 insert into t3 values ('2006-08-17');
 insert into t3 values ('2006-03-25');
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t4;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t5;
-load data infile 'MYSQL_TEST_DIR/suite/partitions/include/partition_supported_sql_funcs_int_date.in' into table t6;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t4;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t5;
+load data infile 'MYSQL_TEST_DIR/suite/parts/inc/part_supported_sql_funcs_int_date.inc' into table t6;
 select yearweek(col1)-200600 from t1 order by col1;
 yearweek(col1)-200600
 1
diff --git a/mysql-test/suite/partitions/r/partition_supported_sql_func_ndb.result b/mysql-test/suite/parts/r/part_supported_sql_func_ndb.result
index 5dc27d16538..5dc27d16538 100644
--- a/mysql-test/suite/partitions/r/partition_supported_sql_func_ndb.result
+++ b/mysql-test/suite/parts/r/part_supported_sql_func_ndb.result
diff --git a/mysql-test/suite/partitions/r/partition_alter1_innodb.result b/mysql-test/suite/parts/r/partition_alter1_innodb.result
index 22f02356b77..22f02356b77 100644
--- a/mysql-test/suite/partitions/r/partition_alter1_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter1_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_alter1_myisam.result b/mysql-test/suite/parts/r/partition_alter1_myisam.result
index b2f1d657151..b2f1d657151 100644
--- a/mysql-test/suite/partitions/r/partition_alter1_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter1_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_alter2_innodb.result b/mysql-test/suite/parts/r/partition_alter2_innodb.result
index cdddae40467..cdddae40467 100644
--- a/mysql-test/suite/partitions/r/partition_alter2_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter2_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_alter2_myisam.result b/mysql-test/suite/parts/r/partition_alter2_myisam.result
index 741ce2d8963..741ce2d8963 100644
--- a/mysql-test/suite/partitions/r/partition_alter2_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter2_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_alter3_innodb.result b/mysql-test/suite/parts/r/partition_alter3_innodb.result
index 25387301cdb..25387301cdb 100644
--- a/mysql-test/suite/partitions/r/partition_alter3_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter3_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_alter3_myisam.result b/mysql-test/suite/parts/r/partition_alter3_myisam.result
index f320dd69dd7..f320dd69dd7 100644
--- a/mysql-test/suite/partitions/r/partition_alter3_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter3_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_alter4_innodb.result b/mysql-test/suite/parts/r/partition_alter4_innodb.result
index 2c5f57d8a46..2c5f57d8a46 100644
--- a/mysql-test/suite/partitions/r/partition_alter4_innodb.result
+++ b/mysql-test/suite/parts/r/partition_alter4_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_alter4_myisam.result b/mysql-test/suite/parts/r/partition_alter4_myisam.result
index 32da415443d..32da415443d 100644
--- a/mysql-test/suite/partitions/r/partition_alter4_myisam.result
+++ b/mysql-test/suite/parts/r/partition_alter4_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_basic_innodb.result b/mysql-test/suite/parts/r/partition_basic_innodb.result
index f9ae10caf18..f9ae10caf18 100644
--- a/mysql-test/suite/partitions/r/partition_basic_innodb.result
+++ b/mysql-test/suite/parts/r/partition_basic_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_basic_myisam.result b/mysql-test/suite/parts/r/partition_basic_myisam.result
index 3a4a1c0d571..3a4a1c0d571 100644
--- a/mysql-test/suite/partitions/r/partition_basic_myisam.result
+++ b/mysql-test/suite/parts/r/partition_basic_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_bit_innodb.result b/mysql-test/suite/parts/r/partition_bit_innodb.result
index 9f6403090ee..9f6403090ee 100644
--- a/mysql-test/suite/partitions/r/partition_bit_innodb.result
+++ b/mysql-test/suite/parts/r/partition_bit_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_bit_myisam.result b/mysql-test/suite/parts/r/partition_bit_myisam.result
index 2bd1b1afd2c..2bd1b1afd2c 100644
--- a/mysql-test/suite/partitions/r/partition_bit_myisam.result
+++ b/mysql-test/suite/parts/r/partition_bit_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_bit_ndb.result b/mysql-test/suite/parts/r/partition_bit_ndb.result
index a39b5717ca0..a39b5717ca0 100644
--- a/mysql-test/suite/partitions/r/partition_bit_ndb.result
+++ b/mysql-test/suite/parts/r/partition_bit_ndb.result
diff --git a/mysql-test/suite/partitions/r/partition_char_innodb.result b/mysql-test/suite/parts/r/partition_char_innodb.result
index 27399a0ad41..27399a0ad41 100644
--- a/mysql-test/suite/partitions/r/partition_char_innodb.result
+++ b/mysql-test/suite/parts/r/partition_char_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_char_myisam.result b/mysql-test/suite/parts/r/partition_char_myisam.result
index 514b2dba1bf..514b2dba1bf 100644
--- a/mysql-test/suite/partitions/r/partition_char_myisam.result
+++ b/mysql-test/suite/parts/r/partition_char_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_datetime_innodb.result b/mysql-test/suite/parts/r/partition_datetime_innodb.result
index f8cf390ebbb..f8cf390ebbb 100644
--- a/mysql-test/suite/partitions/r/partition_datetime_innodb.result
+++ b/mysql-test/suite/parts/r/partition_datetime_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_datetime_myisam.result b/mysql-test/suite/parts/r/partition_datetime_myisam.result
index 2c0091322e1..2c0091322e1 100644
--- a/mysql-test/suite/partitions/r/partition_datetime_myisam.result
+++ b/mysql-test/suite/parts/r/partition_datetime_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_decimal_innodb.result b/mysql-test/suite/parts/r/partition_decimal_innodb.result
index 584ce91724e..584ce91724e 100644
--- a/mysql-test/suite/partitions/r/partition_decimal_innodb.result
+++ b/mysql-test/suite/parts/r/partition_decimal_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_decimal_myisam.result b/mysql-test/suite/parts/r/partition_decimal_myisam.result
index 008c249165d..008c249165d 100644
--- a/mysql-test/suite/partitions/r/partition_decimal_myisam.result
+++ b/mysql-test/suite/parts/r/partition_decimal_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_engine_innodb.result b/mysql-test/suite/parts/r/partition_engine_innodb.result
index bea9a59da9b..bea9a59da9b 100644
--- a/mysql-test/suite/partitions/r/partition_engine_innodb.result
+++ b/mysql-test/suite/parts/r/partition_engine_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_engine_myisam.result b/mysql-test/suite/parts/r/partition_engine_myisam.result
index 343077c5e4d..343077c5e4d 100644
--- a/mysql-test/suite/partitions/r/partition_engine_myisam.result
+++ b/mysql-test/suite/parts/r/partition_engine_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_engine_ndb.result b/mysql-test/suite/parts/r/partition_engine_ndb.result
index a2bed0d6204..a2bed0d6204 100644
--- a/mysql-test/suite/partitions/r/partition_engine_ndb.result
+++ b/mysql-test/suite/parts/r/partition_engine_ndb.result
diff --git a/mysql-test/suite/partitions/r/partition_float_innodb.result b/mysql-test/suite/parts/r/partition_float_innodb.result
index bc30987b33f..bc30987b33f 100644
--- a/mysql-test/suite/partitions/r/partition_float_innodb.result
+++ b/mysql-test/suite/parts/r/partition_float_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_float_myisam.result b/mysql-test/suite/parts/r/partition_float_myisam.result
index 08a1c20d224..08a1c20d224 100644
--- a/mysql-test/suite/partitions/r/partition_float_myisam.result
+++ b/mysql-test/suite/parts/r/partition_float_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_int_innodb.result b/mysql-test/suite/parts/r/partition_int_innodb.result
index 8bc095b2886..8bc095b2886 100644
--- a/mysql-test/suite/partitions/r/partition_int_innodb.result
+++ b/mysql-test/suite/parts/r/partition_int_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_int_myisam.result b/mysql-test/suite/parts/r/partition_int_myisam.result
index d00f8e5f772..d00f8e5f772 100644
--- a/mysql-test/suite/partitions/r/partition_int_myisam.result
+++ b/mysql-test/suite/parts/r/partition_int_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_int_ndb.result b/mysql-test/suite/parts/r/partition_int_ndb.result
index 8bc095b2886..8bc095b2886 100644
--- a/mysql-test/suite/partitions/r/partition_int_ndb.result
+++ b/mysql-test/suite/parts/r/partition_int_ndb.result
diff --git a/mysql-test/suite/partitions/r/partition_special_innodb.result b/mysql-test/suite/parts/r/partition_special_innodb.result
index 4b139bb0f9e..4b139bb0f9e 100644
--- a/mysql-test/suite/partitions/r/partition_special_innodb.result
+++ b/mysql-test/suite/parts/r/partition_special_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_special_myisam.result b/mysql-test/suite/parts/r/partition_special_myisam.result
index f3249f49778..f3249f49778 100644
--- a/mysql-test/suite/partitions/r/partition_special_myisam.result
+++ b/mysql-test/suite/parts/r/partition_special_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_syntax_innodb.result b/mysql-test/suite/parts/r/partition_syntax_innodb.result
index d64bfdde239..d64bfdde239 100644
--- a/mysql-test/suite/partitions/r/partition_syntax_innodb.result
+++ b/mysql-test/suite/parts/r/partition_syntax_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_syntax_myisam.result b/mysql-test/suite/parts/r/partition_syntax_myisam.result
index 34f771ba51d..34f771ba51d 100644
--- a/mysql-test/suite/partitions/r/partition_syntax_myisam.result
+++ b/mysql-test/suite/parts/r/partition_syntax_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_syntax_ndb.result b/mysql-test/suite/parts/r/partition_syntax_ndb.result
index 2b0899fe53a..2b0899fe53a 100644
--- a/mysql-test/suite/partitions/r/partition_syntax_ndb.result
+++ b/mysql-test/suite/parts/r/partition_syntax_ndb.result
diff --git a/mysql-test/suite/partitions/r/partition_t55.out b/mysql-test/suite/parts/r/partition_t55.out
index d86ceda8c38..d86ceda8c38 100644
--- a/mysql-test/suite/partitions/r/partition_t55.out
+++ b/mysql-test/suite/parts/r/partition_t55.out
diff --git a/mysql-test/suite/partitions/r/partition_value_innodb.result b/mysql-test/suite/parts/r/partition_value_innodb.result
index 74843ba7e11..74843ba7e11 100644
--- a/mysql-test/suite/partitions/r/partition_value_innodb.result
+++ b/mysql-test/suite/parts/r/partition_value_innodb.result
diff --git a/mysql-test/suite/partitions/r/partition_value_myisam.result b/mysql-test/suite/parts/r/partition_value_myisam.result
index 0678b78819d..0678b78819d 100644
--- a/mysql-test/suite/partitions/r/partition_value_myisam.result
+++ b/mysql-test/suite/parts/r/partition_value_myisam.result
diff --git a/mysql-test/suite/partitions/r/partition_value_ndb.result b/mysql-test/suite/parts/r/partition_value_ndb.result
index 0787df5f5ac..0787df5f5ac 100644
--- a/mysql-test/suite/partitions/r/partition_value_ndb.result
+++ b/mysql-test/suite/parts/r/partition_value_ndb.result
diff --git a/mysql-test/suite/partitions/r/rpl_ndb_dd_partitions.result b/mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result
index ece6b84c227..ece6b84c227 100644
--- a/mysql-test/suite/partitions/r/rpl_ndb_dd_partitions.result
+++ b/mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result
diff --git a/mysql-test/suite/partitions/t/disabled.def b/mysql-test/suite/parts/t/disabled.def
index 212ca0206e2..212ca0206e2 100644
--- a/mysql-test/suite/partitions/t/disabled.def
+++ b/mysql-test/suite/parts/t/disabled.def
diff --git a/mysql-test/suite/partitions/t/ndb_blob_partition.test b/mysql-test/suite/parts/t/ndb_blob_partition.test
index a3948cc9491..a3948cc9491 100644
--- a/mysql-test/suite/partitions/t/ndb_blob_partition.test
+++ b/mysql-test/suite/parts/t/ndb_blob_partition.test
diff --git a/mysql-test/suite/partitions/t/ndb_dd_backuprestore.test b/mysql-test/suite/parts/t/ndb_dd_backuprestore.test
index be6d73e27b4..be6d73e27b4 100644
--- a/mysql-test/suite/partitions/t/ndb_dd_backuprestore.test
+++ b/mysql-test/suite/parts/t/ndb_dd_backuprestore.test
diff --git a/mysql-test/suite/partitions/t/ndb_partition_error.test b/mysql-test/suite/parts/t/ndb_partition_error.test
index 06581f1270f..06581f1270f 100644
--- a/mysql-test/suite/partitions/t/ndb_partition_error.test
+++ b/mysql-test/suite/parts/t/ndb_partition_error.test
diff --git a/mysql-test/suite/partitions/t/ndb_partition_key.test b/mysql-test/suite/parts/t/ndb_partition_key.test
index fb0581eb6f6..fb0581eb6f6 100644
--- a/mysql-test/suite/partitions/t/ndb_partition_key.test
+++ b/mysql-test/suite/parts/t/ndb_partition_key.test
diff --git a/mysql-test/suite/partitions/t/ndb_partition_list.test b/mysql-test/suite/parts/t/ndb_partition_list.test
index 2ad37b8768c..2ad37b8768c 100644
--- a/mysql-test/suite/partitions/t/ndb_partition_list.test
+++ b/mysql-test/suite/parts/t/ndb_partition_list.test
diff --git a/mysql-test/suite/partitions/t/ndb_partition_range.test b/mysql-test/suite/parts/t/ndb_partition_range.test
index 981467d4055..981467d4055 100644
--- a/mysql-test/suite/partitions/t/ndb_partition_range.test
+++ b/mysql-test/suite/parts/t/ndb_partition_range.test
diff --git a/mysql-test/suite/partitions/t/partition_blocked_sql_func_innodb.test b/mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test
index 4b064b37d48..c2bbf6ad26c 100644
--- a/mysql-test/suite/partitions/t/partition_blocked_sql_func_innodb.test
+++ b/mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test
@@ -39,6 +39,6 @@ let $debug= 0;
 let $engine= 'INNODB';
 
 #------------------------------------------------------------------------------#
---source suite/partitions/include/partition_blocked_sql_funcs_main.inc
-# --source include/partition_blocked_sql_funcs_main.inc
+--source suite/parts/inc/part_blocked_sql_funcs_main.inc
+# --source inc/part_blocked_sql_funcs_main.inc
 
diff --git a/mysql-test/suite/partitions/t/partition_blocked_sql_func_myisam.test b/mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test
index 6d97daca6fc..bd7247e4ba5 100644
--- a/mysql-test/suite/partitions/t/partition_blocked_sql_func_myisam.test
+++ b/mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test
@@ -38,6 +38,6 @@ let $debug= 0;
 let $engine= 'MYISAM';
 
 #------------------------------------------------------------------------------#
---source suite/partitions/include/partition_blocked_sql_funcs_main.inc
-# --source include/partition_blocked_sql_funcs_main.inc
+--source suite/parts/inc/part_blocked_sql_funcs_main.inc
+# --source inc/part_blocked_sql_funcs_main.inc
 
diff --git a/mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test b/mysql-test/suite/parts/t/part_supported_sql_func_innodb.test
index 135c869c841..ee765bbe1d0 100644
--- a/mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test
+++ b/mysql-test/suite/parts/t/part_supported_sql_func_innodb.test
@@ -1,5 +1,5 @@
 ################################################################################
-# t/partition_supported_sql_funcs_innodb.test                                  #
+# t/part_supported_sql_funcs_innodb.test                                  #
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests which SQL functions are allowed in partinioning clauses with          #
@@ -37,6 +37,6 @@ let $do_long_tests= 1;
 let $engine= 'INNODB';
 
 #------------------------------------------------------------------------------#
---source suite/partitions/include/partition_supported_sql_funcs_main.inc
-# --source include/partition_supported_sql_funcs_main.inc
+--source suite/parts/inc/part_supported_sql_funcs_main.inc
+# --source inc/part_supported_sql_funcs_main.inc
 
diff --git a/mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test b/mysql-test/suite/parts/t/part_supported_sql_func_myisam.test
index 131a5e23f39..58c7d8ebfb1 100644
--- a/mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test
+++ b/mysql-test/suite/parts/t/part_supported_sql_func_myisam.test
@@ -1,5 +1,5 @@
 ################################################################################
-# t/partition_supported_sql_funcs_myisam.test                                  #
+# t/part_supported_sql_funcs_myisam.test                                  #
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests which SQL functions are allowed in partinioning clauses with          #
@@ -39,6 +39,6 @@ let $do_long_tests= 1;
 let $engine= 'MYISAM';
 
 #------------------------------------------------------------------------------#
---source suite/partitions/include/partition_supported_sql_funcs_main.inc
-# --source include/partition_supported_sql_funcs_main.inc
+--source suite/parts/inc/part_supported_sql_funcs_main.inc
+# --source inc/part_supported_sql_funcs_main.inc
 
diff --git a/mysql-test/suite/partitions/t/partition_supported_sql_func_ndb.test b/mysql-test/suite/parts/t/part_supported_sql_func_ndb.test
index 2a536fbce94..c21ffe16d19 100644
--- a/mysql-test/suite/partitions/t/partition_supported_sql_func_ndb.test
+++ b/mysql-test/suite/parts/t/part_supported_sql_func_ndb.test
@@ -1,5 +1,5 @@
 ################################################################################
-# t/partition_supported_sql_funcs_myisam.test                                  #
+# t/part_supported_sql_funcs_myisam.test                                  #
 #                                                                              #
 # Purpose:                                                                     #
 #  Tests which SQL functions are allowed in partinioning clauses with          #
@@ -35,6 +35,6 @@ let $do_long_tests= 1;
 let $engine= 'NDB';
 
 #------------------------------------------------------------------------------#
---source suite/partitions/include/partition_supported_sql_funcs_main.inc
-# --source include/partition_supported_sql_funcs_main.inc
+--source suite/parts/inc/part_supported_sql_funcs_main.inc
+# --source inc/part_supported_sql_funcs_main.inc
 
diff --git a/mysql-test/suite/partitions/t/partition_alter1_innodb.test b/mysql-test/suite/parts/t/partition_alter1_innodb.test
index 918cbf0e5fe..2667f1dbccd 100644
--- a/mysql-test/suite/partitions/t/partition_alter1_innodb.test
+++ b/mysql-test/suite/parts/t/partition_alter1_innodb.test
@@ -63,21 +63,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter1.inc
-# --source include/partition_alter1.inc
+--source suite/parts/inc/partition_alter1.inc
+# --source inc/partition_alter1.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter1_myisam.test b/mysql-test/suite/parts/t/partition_alter1_myisam.test
index 7369043001d..0959de92c15 100644
--- a/mysql-test/suite/partitions/t/partition_alter1_myisam.test
+++ b/mysql-test/suite/parts/t/partition_alter1_myisam.test
@@ -62,21 +62,21 @@ let $do_pk_tests= 0;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter1.inc
-# --source include/partition_alter1.inc
+--source suite/parts/inc/partition_alter1.inc
+# --source inc/partition_alter1.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter1_ndb.test b/mysql-test/suite/parts/t/partition_alter1_ndb.test
index 11992d4027b..96ea9376eb9 100644
--- a/mysql-test/suite/partitions/t/partition_alter1_ndb.test
+++ b/mysql-test/suite/parts/t/partition_alter1_ndb.test
@@ -66,8 +66,8 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 # Bug#18735: Partitions: NDB, UNIQUE INDEX, UPDATE, strange server response
@@ -75,13 +75,13 @@ let $fixed_bug18735= 0;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter1.inc
-# --source include/partition_alter1.inc
+--source suite/parts/inc/partition_alter1.inc
+# --source inc/partition_alter1.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter2_innodb.test b/mysql-test/suite/parts/t/partition_alter2_innodb.test
index 1aee1aacba9..df2b4a0e048 100644
--- a/mysql-test/suite/partitions/t/partition_alter2_innodb.test
+++ b/mysql-test/suite/parts/t/partition_alter2_innodb.test
@@ -63,21 +63,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter2.inc
-# --source include/partition_alter2.inc
+--source suite/parts/inc/partition_alter2.inc
+# --source inc/partition_alter2.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter2_myisam.test b/mysql-test/suite/parts/t/partition_alter2_myisam.test
index 894936b86e0..b8b92d1b218 100644
--- a/mysql-test/suite/partitions/t/partition_alter2_myisam.test
+++ b/mysql-test/suite/parts/t/partition_alter2_myisam.test
@@ -62,21 +62,21 @@ let $do_pk_tests= 0;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter2.inc
-# --source include/partition_alter2.inc
+--source suite/parts/inc/partition_alter2.inc
+# --source inc/partition_alter2.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter2_ndb.test b/mysql-test/suite/parts/t/partition_alter2_ndb.test
index 3e2930371f1..8506ec3fea8 100644
--- a/mysql-test/suite/partitions/t/partition_alter2_ndb.test
+++ b/mysql-test/suite/parts/t/partition_alter2_ndb.test
@@ -67,21 +67,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter2.inc
-# --source include/partition_alter2.inc
+--source suite/parts/inc/partition_alter2.inc
+# --source inc/partition_alter2.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter3_innodb.test b/mysql-test/suite/parts/t/partition_alter3_innodb.test
index 28fb0fdf01b..253cd7242bd 100644
--- a/mysql-test/suite/partitions/t/partition_alter3_innodb.test
+++ b/mysql-test/suite/parts/t/partition_alter3_innodb.test
@@ -62,21 +62,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter3.inc
-# --source include/partition_alter3.inc
+--source suite/parts/inc/partition_alter3.inc
+# --source inc/partition_alter3.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter3_myisam.test b/mysql-test/suite/parts/t/partition_alter3_myisam.test
index 8f613dbf9d4..894340de4db 100644
--- a/mysql-test/suite/partitions/t/partition_alter3_myisam.test
+++ b/mysql-test/suite/parts/t/partition_alter3_myisam.test
@@ -61,21 +61,21 @@ let $do_pk_tests= 0;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter3.inc
-# --source include/partition_alter3.inc
+--source suite/parts/inc/partition_alter3.inc
+# --source inc/partition_alter3.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter4_innodb.test b/mysql-test/suite/parts/t/partition_alter4_innodb.test
index 7f4afc5c906..eea8b9997ef 100644
--- a/mysql-test/suite/partitions/t/partition_alter4_innodb.test
+++ b/mysql-test/suite/parts/t/partition_alter4_innodb.test
@@ -63,21 +63,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter4.inc
-# --source include/partition_alter4.inc
+--source suite/parts/inc/partition_alter4.inc
+# --source inc/partition_alter4.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_alter4_myisam.test b/mysql-test/suite/parts/t/partition_alter4_myisam.test
index eec18a78528..064dc111ef3 100644
--- a/mysql-test/suite/partitions/t/partition_alter4_myisam.test
+++ b/mysql-test/suite/parts/t/partition_alter4_myisam.test
@@ -62,21 +62,21 @@ let $do_pk_tests= 0;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_alter4.inc
-# --source include/partition_alter4.inc
+--source suite/parts/inc/partition_alter4.inc
+# --source inc/partition_alter4.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_basic_innodb.test b/mysql-test/suite/parts/t/partition_basic_innodb.test
index 656c505b576..8e6f6e6d166 100644
--- a/mysql-test/suite/partitions/t/partition_basic_innodb.test
+++ b/mysql-test/suite/parts/t/partition_basic_innodb.test
@@ -63,21 +63,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_basic.inc
-# --source include/partition_basic.inc
+--source suite/parts/inc/partition_basic.inc
+# --source inc/partition_basic.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_basic_myisam.test b/mysql-test/suite/parts/t/partition_basic_myisam.test
index 8a7108b8ba7..4f653db88e3 100644
--- a/mysql-test/suite/partitions/t/partition_basic_myisam.test
+++ b/mysql-test/suite/parts/t/partition_basic_myisam.test
@@ -62,21 +62,21 @@ let $do_pk_tests= 0;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_basic.inc
-# --source include/partition_basic.inc
+--source suite/parts/inc/partition_basic.inc
+# --source inc/partition_basic.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_basic_ndb.test b/mysql-test/suite/parts/t/partition_basic_ndb.test
index 6ec2c0047a7..2e6f830eefc 100644
--- a/mysql-test/suite/partitions/t/partition_basic_ndb.test
+++ b/mysql-test/suite/parts/t/partition_basic_ndb.test
@@ -67,8 +67,8 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 # Bug#18730 Partitions: NDB, crash on SELECT MIN(<unique column>)
@@ -78,13 +78,13 @@ let $fixed_bug18735= 0;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_basic.inc
-# --source include/partition_basic.inc
+--source suite/parts/inc/partition_basic.inc
+# --source inc/partition_basic.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_bit_innodb.test b/mysql-test/suite/parts/t/partition_bit_innodb.test
index ebcd5b98265..7bc74036b2e 100644
--- a/mysql-test/suite/partitions/t/partition_bit_innodb.test
+++ b/mysql-test/suite/parts/t/partition_bit_innodb.test
@@ -52,6 +52,6 @@ let $MAX_VALUE= (2147483646);
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_bit.inc
-# --source include/partition_basic.inc
+--source suite/parts/inc/partition_bit.inc
+# --source inc/partition_basic.inc
 
diff --git a/mysql-test/suite/partitions/t/partition_bit_myisam.test b/mysql-test/suite/parts/t/partition_bit_myisam.test
index f218e270915..c21ca104ca5 100644
--- a/mysql-test/suite/partitions/t/partition_bit_myisam.test
+++ b/mysql-test/suite/parts/t/partition_bit_myisam.test
@@ -51,6 +51,6 @@ let $MAX_VALUE= (2147483646);
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_bit.inc
-# --source include/partition_basic.inc
+--source suite/parts/inc/partition_bit.inc
+# --source inc/partition_basic.inc
 
diff --git a/mysql-test/suite/partitions/t/partition_bit_ndb.test b/mysql-test/suite/parts/t/partition_bit_ndb.test
index 36d842c165e..9e21c7de158 100644
--- a/mysql-test/suite/partitions/t/partition_bit_ndb.test
+++ b/mysql-test/suite/parts/t/partition_bit_ndb.test
@@ -52,6 +52,6 @@ let $MAX_VALUE= (2147483646);
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_bit.inc
-# --source include/partition_basic.inc
+--source suite/parts/inc/partition_bit.inc
+# --source inc/partition_basic.inc
 
diff --git a/mysql-test/suite/partitions/t/partition_char_innodb.test b/mysql-test/suite/parts/t/partition_char_innodb.test
index 6fa8e241e6c..d0389517927 100644
--- a/mysql-test/suite/partitions/t/partition_char_innodb.test
+++ b/mysql-test/suite/parts/t/partition_char_innodb.test
@@ -42,19 +42,19 @@ let $maxrows=65535;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_char.inc
---source suite/partitions/include/partition_binary.inc
---source suite/partitions/include/partition_varchar.inc
---source suite/partitions/include/partition_varbinary.inc
---source suite/partitions/include/partition_enum.inc
---source suite/partitions/include/partition_set.inc
---source suite/partitions/include/partition_blob.inc
---source suite/partitions/include/partition_text.inc
-# --source include/partition_char.inc
-# --source include/partition_binary.inc
-# --source include/partition_varchar.inc
-# --source include/partition_varbinary.inc
-# --source include/partition_enum.inc
-# --source include/partition_set.inc
-# --source include/partition_blob.inc
-# --source include/partition_text.inc
+--source suite/parts/inc/partition_char.inc
+--source suite/parts/inc/partition_binary.inc
+--source suite/parts/inc/partition_varchar.inc
+--source suite/parts/inc/partition_varbinary.inc
+--source suite/parts/inc/partition_enum.inc
+--source suite/parts/inc/partition_set.inc
+--source suite/parts/inc/partition_blob.inc
+--source suite/parts/inc/partition_text.inc
+# --source inc/partition_char.inc
+# --source inc/partition_binary.inc
+# --source inc/partition_varchar.inc
+# --source inc/partition_varbinary.inc
+# --source inc/partition_enum.inc
+# --source inc/partition_set.inc
+# --source inc/partition_blob.inc
+# --source inc/partition_text.inc
diff --git a/mysql-test/suite/partitions/t/partition_char_myisam.test b/mysql-test/suite/parts/t/partition_char_myisam.test
index df1e3c4e70f..bdcb2cd9c24 100644
--- a/mysql-test/suite/partitions/t/partition_char_myisam.test
+++ b/mysql-test/suite/parts/t/partition_char_myisam.test
@@ -39,5 +39,5 @@ let $engine= 'MyISAM';
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_key_4col.inc
-# --source include/partition_key_4col.inc
+--source suite/parts/inc/partition_key_4col.inc
+# --source inc/partition_key_4col.inc
diff --git a/mysql-test/suite/partitions/t/partition_datetime_innodb.test b/mysql-test/suite/parts/t/partition_datetime_innodb.test
index 4284d9cbb82..fe19e2803c5 100644
--- a/mysql-test/suite/partitions/t/partition_datetime_innodb.test
+++ b/mysql-test/suite/parts/t/partition_datetime_innodb.test
@@ -42,13 +42,13 @@ let $maxrows=1024;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_timestamp.inc
---source suite/partitions/include/partition_date.inc
---source suite/partitions/include/partition_time.inc
---source suite/partitions/include/partition_datetime.inc
---source suite/partitions/include/partition_year.inc
-# --source include/partition_timestamp.inc
-# --source include/partition_date.inc
-# --source include/partition_time.inc
-# --source include/partition_datetime.inc
-# --source include/partition_year.inc
+--source suite/parts/inc/partition_timestamp.inc
+--source suite/parts/inc/partition_date.inc
+--source suite/parts/inc/partition_time.inc
+--source suite/parts/inc/partition_datetime.inc
+--source suite/parts/inc/partition_year.inc
+# --source inc/partition_timestamp.inc
+# --source inc/partition_date.inc
+# --source inc/partition_time.inc
+# --source inc/partition_datetime.inc
+# --source inc/partition_year.inc
diff --git a/mysql-test/suite/partitions/t/partition_datetime_myisam.test b/mysql-test/suite/parts/t/partition_datetime_myisam.test
index e42c3fd7e15..1fd6527d38e 100644
--- a/mysql-test/suite/partitions/t/partition_datetime_myisam.test
+++ b/mysql-test/suite/parts/t/partition_datetime_myisam.test
@@ -42,13 +42,13 @@ let $maxrows=65535;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_timestamp.inc
---source suite/partitions/include/partition_date.inc
---source suite/partitions/include/partition_time.inc
---source suite/partitions/include/partition_datetime.inc
---source suite/partitions/include/partition_year.inc
-# --source include/partition_timestamp.inc
-# --source include/partition_date.inc
-# --source include/partition_time.inc
-# --source include/partition_datetime.inc
-# --source include/partition_year.inc
+--source suite/parts/inc/partition_timestamp.inc
+--source suite/parts/inc/partition_date.inc
+--source suite/parts/inc/partition_time.inc
+--source suite/parts/inc/partition_datetime.inc
+--source suite/parts/inc/partition_year.inc
+# --source inc/partition_timestamp.inc
+# --source inc/partition_date.inc
+# --source inc/partition_time.inc
+# --source inc/partition_datetime.inc
+# --source inc/partition_year.inc
diff --git a/mysql-test/suite/partitions/t/partition_decimal_innodb.test b/mysql-test/suite/parts/t/partition_decimal_innodb.test
index 6ec3be0be41..ec5948097c8 100644
--- a/mysql-test/suite/partitions/t/partition_decimal_innodb.test
+++ b/mysql-test/suite/parts/t/partition_decimal_innodb.test
@@ -41,5 +41,5 @@ let $maxrows=1024;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_decimal.inc
-# --source include/partition_decimal.inc
+--source suite/parts/inc/partition_decimal.inc
+# --source inc/partition_decimal.inc
diff --git a/mysql-test/suite/partitions/t/partition_decimal_myisam.test b/mysql-test/suite/parts/t/partition_decimal_myisam.test
index d9bdbc446fd..9be50028647 100644
--- a/mysql-test/suite/partitions/t/partition_decimal_myisam.test
+++ b/mysql-test/suite/parts/t/partition_decimal_myisam.test
@@ -41,5 +41,5 @@ let $maxrows=65535;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_decimal.inc
-# --source include/partition_decimal.inc
+--source suite/parts/inc/partition_decimal.inc
+# --source inc/partition_decimal.inc
diff --git a/mysql-test/suite/partitions/t/partition_engine_innodb.test b/mysql-test/suite/parts/t/partition_engine_innodb.test
index ab803ab4f12..6205c970b21 100644
--- a/mysql-test/suite/partitions/t/partition_engine_innodb.test
+++ b/mysql-test/suite/parts/t/partition_engine_innodb.test
@@ -62,21 +62,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_engine.inc
-# --source include/partition_engine.inc
+--source suite/parts/inc/partition_engine.inc
+# --source inc/partition_engine.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_engine_myisam.test b/mysql-test/suite/parts/t/partition_engine_myisam.test
index 781b9dd2a89..437e20ab3ee 100644
--- a/mysql-test/suite/partitions/t/partition_engine_myisam.test
+++ b/mysql-test/suite/parts/t/partition_engine_myisam.test
@@ -61,21 +61,21 @@ let $do_pk_tests= 0;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_engine.inc
-# --source include/partition_engine.inc
+--source suite/parts/inc/partition_engine.inc
+# --source inc/partition_engine.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_engine_ndb.test b/mysql-test/suite/parts/t/partition_engine_ndb.test
index 80858758d69..223e9b035c6 100644
--- a/mysql-test/suite/partitions/t/partition_engine_ndb.test
+++ b/mysql-test/suite/parts/t/partition_engine_ndb.test
@@ -66,21 +66,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_engine.inc
-# --source include/partition_engine.inc
+--source suite/parts/inc/partition_engine.inc
+# --source inc/partition_engine.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_float_innodb.test b/mysql-test/suite/parts/t/partition_float_innodb.test
index c47f83670e7..b36dc0668a6 100644
--- a/mysql-test/suite/partitions/t/partition_float_innodb.test
+++ b/mysql-test/suite/parts/t/partition_float_innodb.test
@@ -41,7 +41,7 @@ let $maxrows=1024;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_float.inc
---source suite/partitions/include/partition_double.inc
-# --source include/partition_float.inc
-# --source include/partition_double.inc
+--source suite/parts/inc/partition_float.inc
+--source suite/parts/inc/partition_double.inc
+# --source inc/partition_float.inc
+# --source inc/partition_double.inc
diff --git a/mysql-test/suite/partitions/t/partition_float_myisam.test b/mysql-test/suite/parts/t/partition_float_myisam.test
index 687ee9f6b30..57ef91a3169 100644
--- a/mysql-test/suite/partitions/t/partition_float_myisam.test
+++ b/mysql-test/suite/parts/t/partition_float_myisam.test
@@ -41,7 +41,7 @@ let $maxrows=16384;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_float.inc
---source suite/partitions/include/partition_double.inc
-# --source include/partition_float.inc
-# --source include/partition_double.inc
+--source suite/parts/inc/partition_float.inc
+--source suite/parts/inc/partition_double.inc
+# --source inc/partition_float.inc
+# --source inc/partition_double.inc
diff --git a/mysql-test/suite/partitions/t/partition_int_innodb.test b/mysql-test/suite/parts/t/partition_int_innodb.test
index bafdd9541c3..fda7398565c 100644
--- a/mysql-test/suite/partitions/t/partition_int_innodb.test
+++ b/mysql-test/suite/parts/t/partition_int_innodb.test
@@ -42,13 +42,13 @@ let $maxrows=1024;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_tinyint.inc
---source suite/partitions/include/partition_smallint.inc
---source suite/partitions/include/partition_int.inc
---source suite/partitions/include/partition_mediumint.inc
---source suite/partitions/include/partition_bigint.inc
-# --source include/partition_tinyint.inc
-# --source include/partition_samllint.inc
-# --source include/partition_int.inc
-# --source include/partition_mediumint.inc
-# --source include/partition_bigint.inc
+--source suite/parts/inc/partition_tinyint.inc
+--source suite/parts/inc/partition_smallint.inc
+--source suite/parts/inc/partition_int.inc
+--source suite/parts/inc/partition_mediumint.inc
+--source suite/parts/inc/partition_bigint.inc
+# --source inc/partition_tinyint.inc
+# --source inc/partition_samllint.inc
+# --source inc/partition_int.inc
+# --source inc/partition_mediumint.inc
+# --source inc/partition_bigint.inc
diff --git a/mysql-test/suite/partitions/t/partition_int_myisam.test b/mysql-test/suite/parts/t/partition_int_myisam.test
index d8b9743900b..c85a1471a35 100644
--- a/mysql-test/suite/partitions/t/partition_int_myisam.test
+++ b/mysql-test/suite/parts/t/partition_int_myisam.test
@@ -41,13 +41,13 @@ let $maxrows=65535;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_tinyint.inc
---source suite/partitions/include/partition_smallint.inc
---source suite/partitions/include/partition_int.inc
---source suite/partitions/include/partition_mediumint.inc
---source suite/partitions/include/partition_bigint.inc
-# --source include/partition_tinyint.inc
-# --source include/partition_samllint.inc
-# --source include/partition_int.inc
-# --source include/partition_mediumint.inc
-# --source include/partition_bigint.inc
+--source suite/parts/inc/partition_tinyint.inc
+--source suite/parts/inc/partition_smallint.inc
+--source suite/parts/inc/partition_int.inc
+--source suite/parts/inc/partition_mediumint.inc
+--source suite/parts/inc/partition_bigint.inc
+# --source inc/partition_tinyint.inc
+# --source inc/partition_samllint.inc
+# --source inc/partition_int.inc
+# --source inc/partition_mediumint.inc
+# --source inc/partition_bigint.inc
diff --git a/mysql-test/suite/partitions/t/partition_int_ndb.test b/mysql-test/suite/parts/t/partition_int_ndb.test
index cca098a6ab7..dfa853bed16 100644
--- a/mysql-test/suite/partitions/t/partition_int_ndb.test
+++ b/mysql-test/suite/parts/t/partition_int_ndb.test
@@ -40,13 +40,13 @@ let $engine= 'NDB';
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_tinyint.inc
---source suite/partitions/include/partition_smallint.inc
---source suite/partitions/include/partition_int.inc
---source suite/partitions/include/partition_mediumint.inc
---source suite/partitions/include/partition_bigint.inc
-# --source include/partition_tinyint.inc
-# --source include/partition_samllint.inc
-# --source include/partition_int.inc
-# --source include/partition_mediumint.inc
-# --source include/partition_bigint.inc
+--source suite/parts/inc/partition_tinyint.inc
+--source suite/parts/inc/partition_smallint.inc
+--source suite/parts/inc/partition_int.inc
+--source suite/parts/inc/partition_mediumint.inc
+--source suite/parts/inc/partition_bigint.inc
+# --source inc/partition_tinyint.inc
+# --source inc/partition_samllint.inc
+# --source inc/partition_int.inc
+# --source inc/partition_mediumint.inc
+# --source inc/partition_bigint.inc
diff --git a/mysql-test/suite/partitions/t/partition_sessions.test b/mysql-test/suite/parts/t/partition_sessions.test
index ef3c5ef6a97..ef3c5ef6a97 100644
--- a/mysql-test/suite/partitions/t/partition_sessions.test
+++ b/mysql-test/suite/parts/t/partition_sessions.test
diff --git a/mysql-test/suite/partitions/t/partition_special_innodb.test b/mysql-test/suite/parts/t/partition_special_innodb.test
index 67c222cbf04..5df518a3952 100644
--- a/mysql-test/suite/partitions/t/partition_special_innodb.test
+++ b/mysql-test/suite/parts/t/partition_special_innodb.test
@@ -39,11 +39,11 @@ let $engine= 'InnoDB';
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_key_4col.inc
---source suite/partitions/include/partition_key_8col.inc
---source suite/partitions/include/partition_key_16col.inc
---source suite/partitions/include/partition_key_32col.inc
-# --source include/partition_key_4col.inc
-# --source include/partition_key_8col.inc
-# --source include/partition_key_16col.inc
-# --source include/partition_key_32col.inc
+--source suite/parts/inc/partition_key_4col.inc
+--source suite/parts/inc/partition_key_8col.inc
+--source suite/parts/inc/partition_key_16col.inc
+--source suite/parts/inc/partition_key_32col.inc
+# --source inc/partition_key_4col.inc
+# --source inc/partition_key_8col.inc
+# --source inc/partition_key_16col.inc
+# --source inc/partition_key_32col.inc
diff --git a/mysql-test/suite/partitions/t/partition_special_myisam.test b/mysql-test/suite/parts/t/partition_special_myisam.test
index f5645f7c992..c87d39ab577 100644
--- a/mysql-test/suite/partitions/t/partition_special_myisam.test
+++ b/mysql-test/suite/parts/t/partition_special_myisam.test
@@ -39,11 +39,11 @@ let $engine= 'MyISAM';
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_key_4col.inc
---source suite/partitions/include/partition_key_8col.inc
---source suite/partitions/include/partition_key_16col.inc
---source suite/partitions/include/partition_key_32col.inc
-# --source include/partition_key_4col.inc
-# --source include/partition_key_8col.inc
-# --source include/partition_key_16col.inc
-# --source include/partition_key_32col.inc
+--source suite/parts/inc/partition_key_4col.inc
+--source suite/parts/inc/partition_key_8col.inc
+--source suite/parts/inc/partition_key_16col.inc
+--source suite/parts/inc/partition_key_32col.inc
+# --source inc/partition_key_4col.inc
+# --source inc/partition_key_8col.inc
+# --source inc/partition_key_16col.inc
+# --source inc/partition_key_32col.inc
diff --git a/mysql-test/suite/partitions/t/partition_syntax_innodb.test b/mysql-test/suite/parts/t/partition_syntax_innodb.test
index ea25a1c5486..ce62b06bd6f 100644
--- a/mysql-test/suite/partitions/t/partition_syntax_innodb.test
+++ b/mysql-test/suite/parts/t/partition_syntax_innodb.test
@@ -62,21 +62,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_syntax.inc
-# --source include/partition_syntax.inc
+--source suite/parts/inc/partition_syntax.inc
+# --source inc/partition_syntax.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_syntax_myisam.test b/mysql-test/suite/parts/t/partition_syntax_myisam.test
index 6fa16e21250..62396580b50 100644
--- a/mysql-test/suite/partitions/t/partition_syntax_myisam.test
+++ b/mysql-test/suite/parts/t/partition_syntax_myisam.test
@@ -61,21 +61,21 @@ let $do_pk_tests= 0;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_syntax.inc
-# --source include/partition_syntax.inc
+--source suite/parts/inc/partition_syntax.inc
+# --source inc/partition_syntax.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_syntax_ndb.test b/mysql-test/suite/parts/t/partition_syntax_ndb.test
index 80cd95ae8b6..3eb453ce7ea 100644
--- a/mysql-test/suite/partitions/t/partition_syntax_ndb.test
+++ b/mysql-test/suite/parts/t/partition_syntax_ndb.test
@@ -66,8 +66,8 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 # Bug#18735: Partitions: NDB, UNIQUE INDEX, UPDATE, strange server response
@@ -75,13 +75,13 @@ let $fixed_bug18735= 0;
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_syntax.inc
-# --source include/partition_syntax.inc
+--source suite/parts/inc/partition_syntax.inc
+# --source inc/partition_syntax.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_value_innodb.test b/mysql-test/suite/parts/t/partition_value_innodb.test
index aaffd5e202d..2e3c6ff98ad 100644
--- a/mysql-test/suite/partitions/t/partition_value_innodb.test
+++ b/mysql-test/suite/parts/t/partition_value_innodb.test
@@ -62,21 +62,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_value.inc
-# --source include/partition_value.inc
+--source suite/parts/inc/partition_value.inc
+# --source inc/partition_value.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_value_myisam.test b/mysql-test/suite/parts/t/partition_value_myisam.test
index 4f6172d717a..78e781111f7 100644
--- a/mysql-test/suite/partitions/t/partition_value_myisam.test
+++ b/mysql-test/suite/parts/t/partition_value_myisam.test
@@ -61,21 +61,21 @@ let $do_pk_tests= 0;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_value.inc
-# --source include/partition_value.inc
+--source suite/parts/inc/partition_value.inc
+# --source inc/partition_value.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/partition_value_ndb.test b/mysql-test/suite/parts/t/partition_value_ndb.test
index fc3f897c556..94230af131e 100644
--- a/mysql-test/suite/partitions/t/partition_value_ndb.test
+++ b/mysql-test/suite/parts/t/partition_value_ndb.test
@@ -66,21 +66,21 @@ let $do_pk_tests= 1;
 let $MAX_VALUE= (2147483646);
 
 # Generate the prerequisites ($variables, @variables, tables) needed
---source suite/partitions/include/partition.pre
-# --source include/partition.pre
+--source suite/parts/inc/partition.pre
+# --source inc/partition.pre
 
 ##### Workarounds for known open engine specific bugs
 #     none
 
 #------------------------------------------------------------------------------#
 # Execute the tests to be applied to all storage engines
---source suite/partitions/include/partition_value.inc
-# --source include/partition_value.inc
+--source suite/parts/inc/partition_value.inc
+# --source inc/partition_value.inc
 
 #------------------------------------------------------------------------------#
 # Execute storage engine specific tests
 
 #------------------------------------------------------------------------------#
 # Cleanup
---source suite/partitions/include/partition_cleanup.inc
-# --source include/partition_cleanup.inc
+--source suite/parts/inc/partition_cleanup.inc
+# --source inc/partition_cleanup.inc
diff --git a/mysql-test/suite/partitions/t/rpl_ndb_dd_partitions.test b/mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test
index 9291f38e8db..9291f38e8db 100644
--- a/mysql-test/suite/partitions/t/rpl_ndb_dd_partitions.test
+++ b/mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test