changed supported sql function to inpuzt files.

mysql-test/suite/funcs_1/r/a_version_check.result:
  new version
mysql-test/suite/partitions/include/partition_supported_sql_funcs.inc:
  read data from file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc:
  read data from file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc:
  read data from file.
mysql-test/suite/partitions/r/partition_supported_sql_func_innodb.result:
  read data from file.
mysql-test/suite/partitions/r/partition_supported_sql_func_myisam.result:
  read data from file.
mysql-test/suite/partitions/t/disabled.def:
  added not executable test program.
mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test:
  switched to long test.
mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test:
  switched to long test
BitKeeper/etc/ignore:
  Added mysql-test/suite/partitions/t/partition.test mysql-test/suite/partitions/r/dif mysql-test/suite/partitions/r/partition.result mysql-test/suite/partitions/r/partition_t55.out mysql-test/suite/partitions/r/partition_t55.refout to the ignore list
mysql-test/suite/partitions/r/partition_supported_sql_func_ndb.result:
  new result file.
mysql-test/suite/partitions/t/partition_supported_sql_func_ndb.test:
  ndb wrapper.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in:
  inpu file.
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_date.in:
  input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_float.in:
  input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_int.in:
  input file
mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_time.in:
  input file
mysql-test/suite/partitions/r/partition_t55.out:
  reference fiel for output data to compare

.bzrignore

@@ -2956,3 +2956,8 @@ win/vs71cache.txt
 win/vs8cache.txt
 zlib/*.ds?
 zlib/*.vcproj
+mysql-test/suite/partitions/t/partition.test
+mysql-test/suite/partitions/r/dif
+mysql-test/suite/partitions/r/partition.result
+mysql-test/suite/partitions/r/partition_t55.out
+mysql-test/suite/partitions/r/partition_t55.refout

mysql-test/suite/funcs_1/r/a_version_check.result

@@ -6,6 +6,6 @@
 . updated with each new version --- THIS IS INTENDED!
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-funcs_1 checked with version: 5.1.16
+funcs_1 checked with version: 5.1.17
 Warnings:
 Warning	1548	Leading spaces are removed from name ' '

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

 ################################################################################
-# t/partition_supported_sql_funcs.inc   #                                                                              #
+# t/partition_supported_sql_funcs.inc                                          #           #                                                                              #
 # Purpose:                                                                     #
-#  Tests around sql functions                                                  #
+#  Tests frame for allowed sql functions                                       #
 #                                                                              #
 #                                                                              #
 #------------------------------------------------------------------------------#
@@ -83,24 +83,23 @@ eval insert into t3 values ($val1);
 eval insert into t3 values ($val2);
 eval insert into t3 values ($val3);
 
-eval insert into t4 values (1,$val1);
-eval insert into t4 values (2,$val2);
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t4;
 
-eval insert into t5 values (1,$val1);
-eval insert into t5 values (2,$val2);
-eval insert into t5 values (3,$val3);
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t5;
 
-eval insert into t6 values (1,$val2);
-eval insert into t6 values (2,$val3);
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
+eval load data infile '$MYSQL_TEST_DIR/suite/partitions/include/$infile' into table t6;
 
-eval select $sqlfunc from t1;
+eval select $sqlfunc from t1 order by col1;
 
-select * from t1;
-select * from t2;
-select * from t3;
-select * from t4;
-select * from t5;
-select * from t6;
+select * from t1 order by col1;
+select * from t2 order by col1;
+select * from t3 order by col1;
+select * from t4 order by colint;
+select * from t5 order by colint;
+select * from t6 order by colint;
 
 if ($do_long_tests)
 {
@@ -111,12 +110,12 @@ if ($do_long_tests)
 	eval update t5 set col1=$val4 where col1=$val1;
 	eval update t6 set col1=$val4 where col1=$val1;
 
-	select * from t1;
-	select * from t2;
-	select * from t3;
-	select * from t4;
-	select * from t5;
-	select * from t6;
+	select * from t1 order by col1;
+	select * from t2 order by col1;
+	select * from t3 order by col1;
+	select * from t4 order by colint;
+	select * from t5 order by colint;
+	select * from t6 order by colint;
 }
 
 --echo -------------------------------------------------------------------------
@@ -175,46 +174,63 @@ partition by range(colint)
 (partition p0 values less than ($valsqlfunc),
  partition p1 values less than maxvalue);
 
-select * from t11;
-select * from t22;
-select * from t33;
-select * from t44;
-select * from t55;
-select * from t66;
+select * from t11 order by col1;
+select * from t22 order by col1;
+select * from t33 order by col1;
+select * from t44 order by colint;
+select * from t55 order by colint;
+select * from t66 order by colint;
  
 if ($do_long_tests)
 {
+        --echo ---------------------------
+        --echo ---- some alter table begin
+        --echo ---------------------------
 	eval alter table t11
 	reorganize partition p0,p1 into
 	(partition s1 values less than maxvalue);
-	select * from t11;
+	select * from t11 order by col1;
 
 	eval alter table t11
 	reorganize partition s1 into
 	(partition p0 values less than (15),
 	 partition p1 values less than maxvalue);
-	select * from t11;
+	select * from t11 order by col1;
+
+eval alter table t55
+partition by list(colint)
+subpartition by hash($sqlfunc) subpartitions 5 
+(partition p0 values in (1,2,3,4,5,6,7,8,9,10),
+ partition p1 values in (11,12,13,14,15,16,17,18,19,20),
+ partition p2 values in (21,22,23,24,25,26,27,28,29,30),
+ partition p3 values in (31,32,33,34,35,36,37,38,39,40),
+ partition p4 values in (41,42,43,44,45,46,47,48,49,50),
+ partition p5 values in (51,52,53,54,55,56,57,58,59,60)
+);
+        show create table t55; 
+	select * from t55 order by colint;
 
 	eval alter table t66
 	reorganize partition p0,p1 into
 	(partition s1 values less than maxvalue);
-	select * from t66;
+	select * from t66 order by colint;
 
 	eval alter table t66
 	reorganize partition s1 into
 	(partition p0 values less than ($valsqlfunc),
 	 partition p1 values less than maxvalue);
-	select * from t66;
+	select * from t66 order by colint;
 	
 	eval alter table t66
         reorganize partition p0,p1 into
         (partition s1 values less than maxvalue);
-        select * from t66;
+        select * from t66 order by colint;
 
-        eval alter table t66
-        add partition s0 
-        (partition p0 values less than ($valsqlfunc);
-        select * fromt t66;
+	eval alter table t66
+        reorganize partition s1 into
+	(partition p0 values less than ($valsqlfunc),
+	 partition p1 values less than maxvalue);
+        select * from t66 order by colint;
 
 	let $t1=t1;
 	let $t2=t2;
@@ -233,6 +249,9 @@ if ($do_long_tests)
 	let $t6=t66;
 	--source suite/partitions/include/partition_supported_sql_funcs_delete.inc
 	# --source include/partition_supported_sql_funcs_delete.inc
+        --echo -------------------------
+        --echo ---- some alter table end
+        --echo -------------------------
 }
 --disable_warnings
 drop table if exists t1 ;

mysql-test/suite/partitions/include/partition_supported_sql_funcs_delete.inc

+################################################################################
+# t/partition_supported_sql_funcs_delete.inc                                   #           #                                                                              #
+# Purpose:                                                                     #
+#  Delete access of the tests frame for allowed sql functions                  #
+#                                                                              #
+#                                                                              #
+#------------------------------------------------------------------------------#
+# Original Author: HH                                                          #
+# Original Date: 2006-11-22                                                    #
+# Change Author:                                                               #
+# Change Date:                                                                 #
+# Change:                                                                      #
+################################################################################
 --echo -------------------------------------------------------------------------
 --echo ---  Delete rows and partitions of tables with $sqlfunc
 --echo -------------------------------------------------------------------------
@@ -9,25 +22,25 @@ eval delete from $t4 where col1=$val2;
 eval delete from $t5 where col1=$val2;
 eval delete from $t6 where col1=$val2;
 
-eval select * from $t1;
-eval select * from $t2;
-eval select * from $t3;
-eval select * from $t4;
-eval select * from $t5;
+eval select * from $t1 order by col1;
+eval select * from $t2 order by col1;
+eval select * from $t3 order by col1;
+eval select * from $t4 order by colint;
+eval select * from $t5 order by colint;
 
 eval insert into $t1 values ($val2);
 eval insert into $t2 values ($val2);
 eval insert into $t3 values ($val2);
-eval insert into $t4 values (4,$val2);
-eval insert into $t5 values (4,$val2);
-eval insert into $t6 values (4,$val2);
+eval insert into $t4 values (60,$val2);
+eval insert into $t5 values (60,$val2);
+eval insert into $t6 values (60,$val2);
 
-eval select * from $t1;
-eval select * from $t2;
-eval select * from $t3;
-eval select * from $t4;
-eval select * from $t5;
-eval select * from $t6;
+eval select * from $t1 order by col1;
+eval select * from $t2 order by col1;
+eval select * from $t3 order by col1;
+eval select * from $t4 order by colint;
+eval select * from $t5 order by colint;
+eval select * from $t6 order by colint;
 
 eval alter table $t1 drop partition p0; 
 eval alter table $t2 drop partition p0; 
@@ -35,9 +48,9 @@ eval alter table $t4 drop partition p0;
 eval alter table $t5 drop partition p0; 
 eval alter table $t6 drop partition p0;  
 
-eval select * from $t1;
-eval select * from $t2;
-eval select * from $t3;
-eval select * from $t4;
-eval select * from $t5;
-eval select * from $t6;
+eval select * from $t1 order by col1;
+eval select * from $t2 order by col1;
+eval select * from $t3 order by col1;
+eval select * from $t4 order by colint;
+eval select * from $t5 order by colint;
+eval select * from $t6 order by colint;

mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_ch1.in

+1	1	
+2	9	
+3	3	
+4	8	
\ No newline at end of file

mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_date.in

+1	2006-02-03	
+2	2006-01-17	
+3	2006-01-25	
+4	2006-02-05	
\ No newline at end of file

mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_float.in

+1	5.1230	
+2	13.345	
+3	17.987	
+4	15.654	

mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_int.in

+1	5	
+2	13	
+3	15	
+4	17	
+5	23	
+6	34	
+7	56	
+8	56	
+9	45	
+10	34	
+11	78	
+12	89	
+13	67	
+14	46	
+15	34	
+16	324	
+17	345	
+18	34	
+19	78	
+20	567	
+21	4	
+22	435	
+23	34	
+24	45	
+25	4565	
+26	4	
+27	3	
+28	2	
+29	3	
+30	5	
+31	6	
+32	8	
+33	9	
+34	745	
+35	34	
+36	34	
+37	324	
+38	67	
+39	78	
+40	89	
+41	90	
+42	78967	
+50	56	
+51	34	
+55	123	
\ No newline at end of file

mysql-test/suite/partitions/include/partition_supported_sql_funcs_int_time.in

+1	09:09:15.000002	
+2	04:30:01.000018	
+3	00:59:22.000024	
+4	05:30:34.000037	

mysql-test/suite/partitions/include/partition_supported_sql_funcs_main.inc

@@ -2,7 +2,7 @@
 # t/partition_supported_sql_funcs_main.inc                                     #
 #                                                                              #
 # Purpose:                                                                     #
-#  Tests around sql functions                                                  #
+#  Tests which SQL functions are allowed in partinioning clauses.              #
 #                                                                              #
 #                                                                              #
 #------------------------------------------------------------------------------#
@@ -11,12 +11,28 @@
 # Change Author:                                                               #
 # Change Date:                                                                 #
 # Change:                                                                      #
+#                                                                              #
+# This test uses a test frame (partition_supported_sql_funcs.inc) for every    #
+# SQL function allowed in the partitioning parts of CREATE and ALTE TABLE.     #
+# The variales represent the                                                   #
+# - SQL function isself with a column (sqlfunc) and a literal (valsqlsunc),    #
+# - the type of the column (coltype),                                          #
+# - a file with test values of the coltype (infile) and                        # 
+# - single test values (val1 to val4).                                         #
+# 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           #
+# partitions.                                                                  #
+# The CREATE and ALTER TABLE statement do not cover the complete partitions    #
+# functions, but will ashure that the SQL functions are basically working.     #
 ################################################################################
 
 
 let $sqlfunc = abs(col1);
 let $valsqlfunc = abs(15);
 let $coltype = int;
+let $infile = partition_supported_sql_funcs_int_int.in;
 let $val1 =  5 ;
 let $val2 = 13 ;
 let $val3 = 17 ;
@@ -27,6 +43,7 @@ let $val4 = 15 ;
 let $sqlfunc = ascii(col1);
 let $valsqlfunc = ascii('5');
 let $coltype = char(1);
+let $infile = partition_supported_sql_funcs_int_ch1.in;
 let $val1 =  '1';
 let $val2 =  '9';
 let $val3 =  '3';
@@ -37,6 +54,7 @@ let $val4 =  '8';
 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 $val1 =  5.1230;
 let $val2 = 13.345;
 let $val3 = 17.987;
@@ -47,6 +65,7 @@ let $val4 = 15.654 ;
 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 $val1 =  5.1230;
 let $val2 = 13.345;
 let $val3 = 17.987;
@@ -57,6 +76,7 @@ let $val4 = 15.654 ;
 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 $val1 =  5.0000;
 let $val2 = 19;
 let $val3 = 17;
@@ -67,6 +87,7 @@ let $val4 = 15 ;
 let $sqlfunc = ord(col1);
 let $valsqlfunc = ord('a');
 let $coltype = char(3);
+let $infile = partition_supported_sql_funcs_int_ch1.in;
 let $val1 =  '1';
 let $val2 =  '9';
 let $val3 =  '3';
@@ -77,6 +98,7 @@ let $val4 =  '8';
 let $sqlfunc = day(col1);
 let $valsqlfunc = day('2006-12-21');
 let $coltype = date;
+let $infile = partition_supported_sql_funcs_int_date.in;
 let $val1 =  '2006-02-03';
 let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
@@ -87,6 +109,7 @@ let $val4 =  '2006-02-05';
 let $sqlfunc = dayofmonth(col1);
 let $valsqlfunc = dayofmonth('2006-12-24');
 let $coltype = date;
+let $infile = partition_supported_sql_funcs_int_date.in;
 let $val1 =  '2006-02-03';
 let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
@@ -97,6 +120,7 @@ let $val4 =  '2006-02-05';
 let $sqlfunc = dayofweek(col1);
 let $valsqlfunc = dayofweek('2006-12-24');
 let $coltype = date;
+let $infile = partition_supported_sql_funcs_int_date.in;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-02-17';
 let $val3 =  '2006-01-25';
@@ -107,6 +131,7 @@ let $val4 =  '2006-02-05';
 let $sqlfunc = dayofyear(col1);
 let $valsqlfunc = dayofyear('2006-12-25');
 let $coltype = date;
+let $infile = partition_supported_sql_funcs_int_date.in;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-01-17';
 let $val3 =  '2006-02-25';
@@ -120,6 +145,7 @@ let $coltype = char(30);
 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 $val1 =  '2006-01-03';
 let $val2 =  '2006-02-17';
 let $val3 =  '2006-01-25';
@@ -130,6 +156,7 @@ let $val4 =  '2006-02-05';
 let $sqlfunc = hour(col1);
 let $valsqlfunc = hour('18:30');
 let $coltype = time;
+let $infile = partition_supported_sql_funcs_int_time.in;
 let $val1 =  '09:09';
 let $val2 =  '14:30';
 let $val3 =  '21:59';
@@ -140,6 +167,7 @@ let $val4 =  '10:30';
 let $sqlfunc = microsecond(col1);
 let $valsqlfunc = microsecond('10:30:10.000010');
 let $coltype = time;
+let $infile = partition_supported_sql_funcs_int_time.in;
 let $val1 =  '09:09:15.000002';
 let $val2 =  '04:30:01.000018';
 let $val3 =  '00:59:22.000024';
@@ -160,6 +188,7 @@ let $val4 =  '10:24:23';
 let $sqlfunc = second(col1);
 let $valsqlfunc = second('18:30:14');
 let $coltype = time;
+let $infile = partition_supported_sql_funcs_int_time.in;
 let $val1 =  '09:09:09';
 let $val2 =  '14:30:20';
 let $val3 =  '21:59:22';
@@ -173,6 +202,7 @@ let $coltype = char(30);
 let $sqlfunc = month(col1);
 let $valsqlfunc = month('2006-10-14');
 let $coltype = date;
+let $infile = partition_supported_sql_funcs_int_date.in;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-12-17';
 let $val3 =  '2006-05-25';
@@ -183,6 +213,7 @@ let $val4 =  '2006-11-06';
 let $sqlfunc = quarter(col1);
 let $valsqlfunc = quarter('2006-10-14');
 let $coltype = date;
+let $infile = partition_supported_sql_funcs_int_date.in;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-12-17';
 let $val3 =  '2006-09-25';
@@ -193,6 +224,7 @@ let $val4 =  '2006-07-30';
 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 $val1 =  '09:09:15';
 let $val2 =  '14:30:45';
 let $val3 =  '21:59:22';
@@ -203,6 +235,7 @@ let $val4 =  '10:33:11';
 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 $val1 =  '2006-02-03';
 let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
@@ -213,6 +246,7 @@ let $val4 =  '2006-02-06';
 let $sqlfunc = weekday(col1);
 let $valsqlfunc = weekday('2006-10-14');
 let $coltype = date;
+let $infile = partition_supported_sql_funcs_int_date.in;
 let $val1 =  '2006-12-03';
 let $val2 =  '2006-11-17';
 let $val3 =  '2006-05-25';
@@ -223,6 +257,7 @@ let $val4 =  '2006-02-06';
 let $sqlfunc = weekofyear(col1);
 let $valsqlfunc = weekofyear('2006-02-14');
 let $coltype = date;
+let $infile = partition_supported_sql_funcs_int_date.in;
 let $val1 =  '2006-01-03';
 let $val2 =  '2006-03-17';
 let $val3 =  '2006-05-25';
@@ -233,6 +268,7 @@ let $val4 =  '2006-09-06';
 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 $val1 =  '1996-01-03';
 let $val2 =  '2000-02-17';
 let $val3 =  '2004-05-25';
@@ -243,6 +279,7 @@ let $val4 =  '2002-02-15';
 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 $val1 =  '2006-01-03';
 let $val2 =  '2006-08-17';
 let $val3 =  '2006-03-25';

mysql-test/suite/partitions/r/partition_t55.out

+show create table t55;
+Table	Create Table
+t55	CREATE TABLE `t55` (
+  `colint` int(11) DEFAULT NULL,
+  `col1` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY HASH (abs(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE = MyISAM, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = MyISAM, PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = MyISAM, PARTITION p3 VALUES IN (31,32,33,34,35,36,37,38,39,40) ENGINE = MyISAM, PARTITION p4 VALUES IN (41,42,43,44,45,46,47,48,49,50) ENGINE = MyISAM, PARTITION p5 VALUES IN (51,52,53,54,55,56,57,58,59,60) ENGINE = MyISAM) */
+27	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp0.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp0.MYI
+18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp1.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp1.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp2.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp2.MYI
+18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp3.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp3.MYI
+18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp4.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p0#SP#p0sp4.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp0.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp0.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp1.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp1.MYI
+18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp2.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp2.MYI
+18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp3.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp3.MYI
+36	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp4.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p1#SP#p1sp4.MYI
+36	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp0.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp0.MYI
+0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp1.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp1.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp2.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp2.MYI
+18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp3.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp3.MYI
+27	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp4.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p2#SP#p2sp4.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp0.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp0.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp1.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp1.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp2.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp2.MYI
+18	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp3.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp3.MYI
+45	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp4.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p3#SP#p3sp4.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp0.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp0.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp1.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp1.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp2.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp2.MYI
+0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp3.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp3.MYI
+0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp4.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p4#SP#p4sp4.MYI
+0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp0.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp0.MYI
+0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp1.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp1.MYI
+0	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp2.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp2.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp3.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp3.MYI
+9	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp4.MYD
+1024	MYSQL_TEST_DIR/var/master-data/test/t55#P#p5#SP#p5sp4.MYI
+8594	MYSQL_TEST_DIR/var/master-data/test/t55.frm
+408	MYSQL_TEST_DIR/var/master-data/test/t55.par

mysql-test/suite/partitions/t/disabled.def

@@ -13,4 +13,4 @@ partition_alter2_ndb           : cannot create t1
 partition_char_innodb          : crash. Bug? More investigations
 partition_sessions             : needs system_3_init.inc
 partition_engine_ndb           : cannot create t1
-
+partition_supported_sql_func_ndb : cannot create t1

mysql-test/suite/partitions/t/partition_supported_sql_func_innodb.test

@@ -2,8 +2,8 @@
 # t/partition_supported_sql_funcs_innodb.test                                  #
 #                                                                              #
 # Purpose:                                                                     #
-#  Tests around sql functions                                                  #
-#        INNODB branch                                                         #
+#  Tests which SQL functions are allowed in partinioning clauses with          #
+#  INNODB.                                                                     #
 #                                                                              #
 #------------------------------------------------------------------------------#
 # Original Author: HH                                                          #
@@ -18,16 +18,12 @@
 #       TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
 #       THE SOURCED FILES ONLY.
 #
-# Please read the README at the end of include/partition.pre before changing
-# any of the variables.
-#
-
 #------------------------------------------------------------------------------#
 # General not engine specific settings and requirements
 
 ##### Options, for debugging support #####
 let $debug= 0;
-let $do_long_tests= 0;
+let $do_long_tests= 1;
 
 # The server must support partitioning.
 --source include/have_partition.inc

mysql-test/suite/partitions/t/partition_supported_sql_func_myisam.test

@@ -2,8 +2,8 @@
 # t/partition_supported_sql_funcs_myisam.test                                  #
 #                                                                              #
 # Purpose:                                                                     #
-#  Tests around sql functions                                                  #
-#        MyISAM branch                                                         #
+#  Tests which SQL functions are allowed in partinioning clauses with          #
+#  MYISAM.                                                                     #
 #                                                                              #
 #------------------------------------------------------------------------------#
 # Original Author: HH                                                          #
@@ -27,7 +27,7 @@
 
 ##### Options, for debugging support #####
 let $debug= 0;
-let $do_long_tests= 0;
+let $do_long_tests= 1;
 
 # The server must support partitioning.
 --source include/have_partition.inc

mysql-test/suite/partitions/t/partition_supported_sql_func_ndb.test

+################################################################################
+# t/partition_supported_sql_funcs_myisam.test                                  #
+#                                                                              #
+# Purpose:                                                                     #
+#  Tests which SQL functions are allowed in partinioning clauses with          #
+#  NDB.                                                                        #
+#                                                                              #
+#------------------------------------------------------------------------------#
+# Original Author: HH                                                          #
+# Original Date: 2006-11-22                                                    #
+# Change Author:                                                               #
+# Change Date:                                                                 #
+# Change:                                                                      #
+################################################################################
+
+#
+# NOTE: PLEASE DO NOT ADD NOT NDB SPECIFIC TESTCASES HERE !
+#       TESTCASES WHICH MUST BE APPLIED TO ALL STORAGE ENGINES MUST BE ADDED IN
+#       THE SOURCED FILES ONLY.
+#------------------------------------------------------------------------------#
+# General not engine specific settings and requirements
+
+##### Options, for debugging support #####
+let $debug= 0;
+let $do_long_tests= 1;
+
+# The server must support partitioning.
+--source include/have_partition.inc
+
+#------------------------------------------------------------------------------#
+# Engine specific settings and requirements
+
+--source include/have_ndb.inc
+##### Storage engine to be tested
+let $engine= 'NDB';
+
+#------------------------------------------------------------------------------#
+--source suite/partitions/include/partition_supported_sql_funcs_main.inc
+# --source include/partition_supported_sql_funcs_main.inc
+