List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:July 8 2008 1:08am
Subject:bzr commit into mysql-6.0 branch (mattiasj:2698)
View as plain text  
#At file:///Users/mattiasj/clones/bzrroot/topush2-60-bugteam/

 2698 Mattias Jonsson	2008-07-08 [merge]
      merge from 51-bugteam -> 60-bugteam
removed:
  mysql-test/suite/parts/r/ndb_blob_partition.result
  mysql-test/suite/parts/r/ndb_partition_error.result
  mysql-test/suite/parts/r/ndb_partition_key.result
  mysql-test/suite/parts/r/ndb_partition_list.result
  mysql-test/suite/parts/r/ndb_partition_range.result
  mysql-test/suite/parts/r/rpl_ndb_dd_partitions.result
  mysql-test/suite/parts/t/ndb_blob_partition.test
  mysql-test/suite/parts/t/ndb_partition_error.test
  mysql-test/suite/parts/t/ndb_partition_key.test
  mysql-test/suite/parts/t/ndb_partition_list.test
  mysql-test/suite/parts/t/ndb_partition_range.test
  mysql-test/suite/parts/t/rpl_ndb_dd_partitions.test
modified:
  mysql-test/r/partition.result
  mysql-test/r/partition_hash.result
  mysql-test/r/partition_pruning.result
  mysql-test/r/partition_range.result
  mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
  mysql-test/suite/parts/inc/partition_alter_11.inc
  mysql-test/suite/parts/inc/partition_bigint.inc
  mysql-test/suite/parts/inc/partition_int.inc
  mysql-test/suite/parts/inc/partition_mediumint.inc
  mysql-test/suite/parts/inc/partition_smallint.inc
  mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
  mysql-test/suite/parts/inc/partition_tinyint.inc
  mysql-test/suite/parts/r/ndb_dd_backuprestore.result
  mysql-test/suite/parts/r/part_supported_sql_func_ndb.result
  mysql-test/suite/parts/r/partition_alter1_1_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_myisam.result
  mysql-test/suite/parts/r/partition_alter1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter1_2_myisam.result
  mysql-test/suite/parts/r/partition_alter2_innodb.result
  mysql-test/suite/parts/r/partition_alter2_myisam.result
  mysql-test/suite/parts/r/partition_alter3_innodb.result
  mysql-test/suite/parts/r/partition_alter3_myisam.result
  mysql-test/suite/parts/r/partition_engine_ndb.result
  mysql-test/suite/parts/r/partition_int_innodb.result
  mysql-test/suite/parts/r/partition_int_myisam.result
  mysql-test/suite/parts/r/partition_int_ndb.result
  mysql-test/suite/parts/t/disabled.def
  mysql-test/suite/parts/t/ndb_dd_backuprestore.test
  mysql-test/suite/parts/t/part_supported_sql_func_ndb.test
  mysql-test/suite/parts/t/partition_alter1_1_2_ndb.test
  mysql-test/suite/parts/t/partition_alter1_1_ndb.test
  mysql-test/suite/parts/t/partition_alter1_2_ndb.test
  mysql-test/suite/parts/t/partition_alter2_ndb.test
  mysql-test/suite/parts/t/partition_basic_ndb.test
  mysql-test/suite/parts/t/partition_bit_ndb.test
  mysql-test/suite/parts/t/partition_engine_ndb.test
  mysql-test/suite/parts/t/partition_int_ndb.test
  mysql-test/suite/parts/t/partition_syntax_ndb.test
  mysql-test/suite/parts/t/partition_value_ndb.test
  sql/ha_partition.cc
  sql/ha_partition.h

=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2008-06-18 04:01:25 +0000
+++ b/mysql-test/r/partition.result	2008-07-07 23:07:28 +0000
@@ -1147,7 +1147,7 @@ NULL
 2
 explain partitions select * from t1 where a is null or a < 0 or a > 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	pn,p2	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	pn,p2	ALL	NULL	NULL	NULL	NULL	4	Using where
 drop table t1;
 CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, name VARCHAR(20)) 
 ENGINE=MyISAM DEFAULT CHARSET=latin1

=== modified file 'mysql-test/r/partition_hash.result'
--- a/mysql-test/r/partition_hash.result	2007-11-20 10:21:00 +0000
+++ b/mysql-test/r/partition_hash.result	2008-07-07 20:42:19 +0000
@@ -69,25 +69,25 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t1	p0,p1,p2,p3	ALL	NULL	NULL	NULL	NULL	9	Using where
 explain partitions select * from t1 where a is null or (a >= 5 and a <= 7);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0,p2,p3	ALL	NULL	NULL	NULL	NULL	7	Using where
+1	SIMPLE	t1	p0,p2,p3	ALL	NULL	NULL	NULL	NULL	9	Using where
 explain partitions select * from t1 where a is null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	3	Using where
+1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	9	Using where
 explain partitions select * from t1 where a is not null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0,p1,p2,p3	ALL	NULL	NULL	NULL	NULL	9	Using where
 explain partitions select * from t1 where a >= 1 and a < 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	5	Using where
+1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	9	Using where
 explain partitions select * from t1 where a >= 3 and a <= 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p1,p2	ALL	NULL	NULL	NULL	NULL	4	Using where
+1	SIMPLE	t1	p1,p2	ALL	NULL	NULL	NULL	NULL	9	Using where
 explain partitions select * from t1 where a > 2 and a < 4;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p1	ALL	NULL	NULL	NULL	NULL	9	Using where
 explain partitions select * from t1 where a > 3 and a <= 6;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p2,p3	ALL	NULL	NULL	NULL	NULL	4	Using where
+1	SIMPLE	t1	p2,p3	ALL	NULL	NULL	NULL	NULL	9	Using where
 explain partitions select * from t1 where a > 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0,p1,p2,p3	ALL	NULL	NULL	NULL	NULL	9	Using where

=== modified file 'mysql-test/r/partition_pruning.result'
--- a/mysql-test/r/partition_pruning.result	2007-10-10 12:23:12 +0000
+++ b/mysql-test/r/partition_pruning.result	2008-07-07 23:07:28 +0000
@@ -31,7 +31,7 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t2	p0,p1	ALL	NULL	NULL	NULL	NULL	3	Using where
 explain partitions select * from t2 where a=1 and b=1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p0	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t2	p0	ALL	NULL	NULL	NULL	NULL	3	Using where
 create table t3 (
 a int
 )
@@ -89,25 +89,25 @@ id	select_type	table	partitions	type	pos
 explain partitions select * from t5
 where (a=10 and b=1) or (a=10 and b=2) or (a=10 and b = 3);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t5	p0_p0sp0,p0_p0sp1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t5	p0_p0sp0,p0_p0sp1	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t5 where (a=10 and b=2) or (a=10 and b=3)
 or (a=10 and b = 4);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t5	p0_p0sp0,p0_p0sp1,p1_p1sp0,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t5 where (c=1 and d=1);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t5	p0_p0sp0,p1_p1sp0	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t5	p0_p0sp0,p1_p1sp0	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t5 where (c=2 and d=1);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t5	p0_p0sp1,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t5	p0_p0sp1,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t5 where (a=10 and b=2 and c=1 and d=1) or 
 (c=2 and d=1);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t5	p0_p0sp0,p0_p0sp1,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	3	Using where
+1	SIMPLE	t5	p0_p0sp0,p0_p0sp1,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t5 where (a=10 and b=2 and c=1 and d=1) or 
 (b=2 and c=2 and d=1);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t5	p0_p0sp0,p0_p0sp1,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	3	Using where
+1	SIMPLE	t5	p0_p0sp0,p0_p0sp1,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	4	Using where
 create table t6 (a int not null) partition by LIST(a) (
 partition p1 values in (1),
 partition p3 values in (3),
@@ -145,7 +145,7 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t6	p5,p7,p9	system	NULL	NULL	NULL	NULL	1	
 explain partitions select * from t6 where a >= 3 and a <= 8;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t6	p3,p5,p7	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t6	p3,p5,p7	ALL	NULL	NULL	NULL	NULL	3	Using where
 explain partitions select * from t6 where a > 3 and a < 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
@@ -187,7 +187,7 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t6	p5,p7,p9	system	NULL	NULL	NULL	NULL	1	
 explain partitions select * from t6 where a >= 3 and a <= 8;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t6	p3,p5,p7	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t6	p3,p5,p7	ALL	NULL	NULL	NULL	NULL	3	Using where
 explain partitions select * from t6 where a > 3 and a < 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
@@ -342,7 +342,7 @@ id	select_type	table	partitions	type	pos
 explain partitions
 select * from t1 X, t1 Y where X.a = Y.a and (X.a=1 or X.a=2);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	X	p1,p2	ALL	a	NULL	NULL	NULL	2	Using where
+1	SIMPLE	X	p1,p2	ALL	a	NULL	NULL	NULL	4	Using where
 1	SIMPLE	Y	p1,p2	ref	a	a	4	test.X.a	2	
 drop table t1;
 create table t1 (a int) partition by hash(a) partitions 20;
@@ -355,7 +355,7 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t1	p1,p2	ALL	NULL	NULL	NULL	NULL	2	Using where
 explain partitions select * from t1 where a >  1 and a <= 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p2,p3	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p2,p3	ALL	NULL	NULL	NULL	NULL	3	Using where
 explain partitions select * from t1 where a >= 1 and a <= 3;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p1,p2,p3	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -445,22 +445,22 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t2	p0,p1,p2,p3,p4	ALL	NULL	NULL	NULL	NULL	1010	
 explain partitions select * from t2 where a < 801 and a > 200;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p1,p2,p3,p4	ALL	NULL	NULL	NULL	NULL	800	Using where
+1	SIMPLE	t2	p1,p2,p3,p4	ALL	NULL	NULL	NULL	NULL	1010	Using where
 explain partitions select * from t2 where a < 801 and a > 800;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p4	ALL	NULL	NULL	NULL	NULL	200	Using where
+1	SIMPLE	t2	p4	ALL	NULL	NULL	NULL	NULL	1010	Using where
 explain partitions select * from t2 where a > 600;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p3,p4	ALL	NULL	NULL	NULL	NULL	400	Using where
+1	SIMPLE	t2	p3,p4	ALL	NULL	NULL	NULL	NULL	1010	Using where
 explain partitions select * from t2 where a > 600 and b = 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p3,p4	ALL	NULL	NULL	NULL	NULL	400	Using where
+1	SIMPLE	t2	p3,p4	ALL	NULL	NULL	NULL	NULL	1010	Using where
 explain partitions select * from t2 where a > 600 and b = 4;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p3,p4	ALL	NULL	NULL	NULL	NULL	400	Using where
+1	SIMPLE	t2	p3,p4	ALL	NULL	NULL	NULL	NULL	1010	Using where
 explain partitions select * from t2 where a > 600 and b = 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p3,p4	ALL	NULL	NULL	NULL	NULL	400	Using where
+1	SIMPLE	t2	p3,p4	ALL	NULL	NULL	NULL	NULL	1010	Using where
 explain partitions select * from t2 where b = 5;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	p0,p1,p2,p3,p4	ALL	NULL	NULL	NULL	NULL	1010	Using where
@@ -515,19 +515,19 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t2	p0,p1,p2,p3,p4	ALL	NULL	NULL	NULL	NULL	910	
 explain partitions select * from t2 where a = 101;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p0	ALL	NULL	NULL	NULL	NULL	110	Using where
+1	SIMPLE	t2	p0	ALL	NULL	NULL	NULL	NULL	910	Using where
 explain partitions select * from t2 where a = 550;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p2	ALL	NULL	NULL	NULL	NULL	200	Using where
+1	SIMPLE	t2	p2	ALL	NULL	NULL	NULL	NULL	910	Using where
 explain partitions select * from t2 where a = 833;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p4	ALL	NULL	NULL	NULL	NULL	200	Using where
+1	SIMPLE	t2	p4	ALL	NULL	NULL	NULL	NULL	910	Using where
 explain partitions select * from t2 where (a = 100 OR a = 900);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p0,p4	ALL	NULL	NULL	NULL	NULL	310	Using where
+1	SIMPLE	t2	p0,p4	ALL	NULL	NULL	NULL	NULL	910	Using where
 explain partitions select * from t2 where (a > 100 AND a < 600);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p0,p1,p2,p3	ALL	NULL	NULL	NULL	NULL	710	Using where
+1	SIMPLE	t2	p0,p1,p2,p3	ALL	NULL	NULL	NULL	NULL	910	Using where
 explain partitions select * from t2 where b = 4;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	p0,p1,p2,p3,p4	ref	b	b	5	const	76	
@@ -813,17 +813,17 @@ id	select_type	table	partitions	type	pos
 explain partitions select * from t1 
 where a >= 18446744073709551000-1 and a <= 18446744073709551000+1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p3,p4	ALL	NULL	NULL	NULL	NULL	3	Using where
+1	SIMPLE	t1	p3,p4	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t1 
 where a between 18446744073709551001 and 18446744073709551002;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t1 where a = 18446744073709551000;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t1 where a = 18446744073709551613;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p4	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t1 where a = 18446744073709551614;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
@@ -850,10 +850,10 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t2	p0	ALL	NULL	NULL	NULL	NULL	2	Using where
 explain partitions select * from t1 where a=0xFE;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p2	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p2	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t2 where a=0xFE;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p2	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t2	p2	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t1 where a > 0xFE AND a <= 0xFF;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
@@ -862,22 +862,22 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
 explain partitions select * from t1 where a >= 0xFE AND a <= 0xFF;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p2	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p2	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t2 where a >= 0xFE AND a <= 0xFF;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p2	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t2	p2	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t1 where a < 64 AND a >= 63;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t2 where a < 64 AND a >= 63;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p0	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t2	p0	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t1 where a <= 64 AND a >= 63;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	4	Using where
+1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	6	Using where
 explain partitions select * from t2 where a <= 64 AND a >= 63;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	p0,p1	ALL	NULL	NULL	NULL	NULL	4	Using where
+1	SIMPLE	t2	p0,p1	ALL	NULL	NULL	NULL	NULL	6	Using where
 drop table t1;
 drop table t2;
 create table t1(a bigint unsigned not null) partition by range(a+0) (

=== modified file 'mysql-test/r/partition_range.result'
--- a/mysql-test/r/partition_range.result	2008-03-27 19:02:15 +0000
+++ b/mysql-test/r/partition_range.result	2008-07-07 23:07:28 +0000
@@ -57,13 +57,13 @@ id	select_type	table	partitions	type	pos
 1	SIMPLE	t1	pnull	system	NULL	NULL	NULL	NULL	1	
 explain partitions select * from t1 where a >= 0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	p0,p1	ALL	NULL	NULL	NULL	NULL	3	Using where
 explain partitions select * from t1 where a < 0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
 explain partitions select * from t1 where a <= 0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	pnull,p0	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	pnull,p0	ALL	NULL	NULL	NULL	NULL	3	Using where
 explain partitions select * from t1 where a > 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables
@@ -96,16 +96,16 @@ select * from t1 where a > 1;
 a	b
 explain partitions select * from t1 where a is null;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	pnull_pnullsp0,pnull_pnullsp1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	pnull_pnullsp0,pnull_pnullsp1	ALL	NULL	NULL	NULL	NULL	6	Using where
 explain partitions select * from t1 where a >= 0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p0_p0sp0,p0_p0sp1,p1_p1sp0,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	4	Using where
+1	SIMPLE	t1	p0_p0sp0,p0_p0sp1,p1_p1sp0,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	6	Using where
 explain partitions select * from t1 where a < 0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	pnull_pnullsp0,pnull_pnullsp1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	t1	pnull_pnullsp0,pnull_pnullsp1	ALL	NULL	NULL	NULL	NULL	6	Using where
 explain partitions select * from t1 where a <= 0;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	pnull_pnullsp0,pnull_pnullsp1,p0_p0sp0,p0_p0sp1	ALL	NULL	NULL	NULL	NULL	4	Using
where
+1	SIMPLE	t1	pnull_pnullsp0,pnull_pnullsp1,p0_p0sp0,p0_p0sp1	ALL	NULL	NULL	NULL	NULL	6	Using
where
 explain partitions select * from t1 where a > 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading
const tables

=== modified file 'mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc'
--- a/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc	2007-11-20 15:04:07
+0000
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc	2008-07-01 18:38:15
+0000
@@ -43,6 +43,8 @@ eval select * from $t4 order by colint;
 eval select * from $t5 order by colint;
 eval select * from $t6 order by colint;
 
+if (!$drop_partition_not_supported)
+{
 eval alter table $t1 drop partition p0; 
 eval alter table $t2 drop partition p0; 
 eval alter table $t4 drop partition p0; 
@@ -55,3 +57,4 @@ 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;
+}

=== modified file 'mysql-test/suite/parts/inc/partition_alter_11.inc'
--- a/mysql-test/suite/parts/inc/partition_alter_11.inc	2007-11-20 15:04:07 +0000
+++ b/mysql-test/suite/parts/inc/partition_alter_11.inc	2008-07-01 18:38:15 +0000
@@ -92,16 +92,13 @@ $partitioning;
 #----------- PARTITION BY RANGE
 if ($with_partitioning)
 {
---disable_query_log
-eval SET @aux = 'PARTITION BY RANGE(f_int1)
+let $partitioning= PARTITION BY RANGE(f_int1)
 (PARTITION parta VALUES LESS THAN (0),
 PARTITION partb VALUES LESS THAN ($max_row_div4),
 PARTITION partc VALUES LESS THAN ($max_row_div2),
 PARTITION partd VALUES LESS THAN ($max_row_div2 + $max_row_div4),
 PARTITION parte VALUES LESS THAN ($max_row),
-PARTITION partf VALUES LESS THAN $MAX_VALUE)';
-let $partitioning= `SELECT @aux`;
---enable_query_log
+PARTITION partf VALUES LESS THAN $MAX_VALUE);
 }
 eval CREATE TABLE t1 (
 $column_list
@@ -113,15 +110,11 @@ $partitioning;
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
 if ($with_partitioning)
 {
---disable_query_log
-eval SET @aux =
-'PARTITION BY RANGE(f_int1 DIV 2) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 2
+let $partitioning= PARTITION BY RANGE(f_int1 DIV 2) SUBPARTITION BY HASH(f_int1)
SUBPARTITIONS 2
 (PARTITION parta VALUES LESS THAN (0),
 PARTITION partb VALUES LESS THAN ($max_row_div4),
 PARTITION partc VALUES LESS THAN ($max_row_div2),
-PARTITION partd VALUES LESS THAN $MAX_VALUE)';
-let $partitioning= `SELECT @aux`;
---enable_query_log
+PARTITION partd VALUES LESS THAN $MAX_VALUE);
 }
 eval CREATE TABLE t1 (
 $column_list
@@ -133,8 +126,7 @@ $partitioning;
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 if ($with_partitioning)
 {
---disable_query_log
-eval SET @aux = 'PARTITION BY RANGE(f_int1) SUBPARTITION BY KEY(f_int1)
+let $partitioning= PARTITION BY RANGE(f_int1) SUBPARTITION BY KEY(f_int1)
 (PARTITION part1 VALUES LESS THAN (0)
 (SUBPARTITION subpart11, SUBPARTITION subpart12),
 PARTITION part2 VALUES LESS THAN ($max_row_div4)
@@ -142,9 +134,7 @@ PARTITION part2 VALUES LESS THAN ($max_r
 PARTITION part3 VALUES LESS THAN ($max_row_div2)
 (SUBPARTITION subpart31, SUBPARTITION subpart32),
 PARTITION part4 VALUES LESS THAN $MAX_VALUE
-(SUBPARTITION subpart41, SUBPARTITION subpart42))';
-let $partitioning= `SELECT @aux`;
---enable_query_log
+(SUBPARTITION subpart41, SUBPARTITION subpart42));
 }
 eval CREATE TABLE t1 (
 $column_list
@@ -176,15 +166,11 @@ $partitioning;
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
 if ($with_partitioning)
 {
---disable_query_log
-eval SET @aux =
-'PARTITION BY LIST(ABS(MOD(f_int1,2)))
+let $partitioning= PARTITION BY LIST(ABS(MOD(f_int1,2)))
 SUBPARTITION BY KEY(f_int1) SUBPARTITIONS $sub_part_no
 (PARTITION part1 VALUES IN (0),
  PARTITION part2 VALUES IN (1),
- PARTITION part3 VALUES IN (NULL))';
-let $partitioning= `SELECT @aux`;
---enable_query_log
+ PARTITION part3 VALUES IN (NULL));
 }
 eval CREATE TABLE t1 (
 $column_list

=== modified file 'mysql-test/suite/parts/inc/partition_bigint.inc'
--- a/mysql-test/suite/parts/inc/partition_bigint.inc	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_bigint.inc	2008-07-01 18:38:15 +0000
@@ -6,22 +6,27 @@ partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
 show create table t1;
 insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE),
(18446744073709551613), (18446744073709551612), (1), (2), (65535);
+--sorted_result
 select * from t1;
 select * from t1 where a=-2;
 delete from t1 where a=-2;
+--sorted_result
 select * from t1;
 select * from t1 where a=18446744073709551615;
 delete from t1 where a=18446744073709551615;
+--sorted_result
 select * from t1;
 drop table t1;
 
 eval create table t2 (a bigint unsigned not null, primary key(a)) engine=$engine 
-partition by key (a) partitions 10;
+partition by key (a) partitions 8;
 show create table t2;
 insert into t2 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE),
(18446744073709551613), (18446744073709551612);
+--sorted_result
 select * from t2;
 select * from t2 where a=18446744073709551615;
 delete from t2 where a=18446744073709551615;
+--sorted_result
 select * from t2;
 delete from t2;
 let $count=$maxrows;
@@ -37,11 +42,13 @@ select count(*) from t2;
 drop table t2;
 
 eval create table t3 (a bigint not null, primary key(a)) engine=$engine 
-partition by key (a) partitions 10;
+partition by key (a) partitions 7;
 show create table t3;
 insert into t3 values (9223372036854775807), (9223372036854775806),
(9223372036854775805), (9223372036854775804), (-9223372036854775808),
(-9223372036854775807), (1), (-1), (0);
+--sorted_result
 select * from t3;
 select * from t3 where a=9223372036854775806;
 delete from t3 where a=9223372036854775806;
+--sorted_result
 select * from t3;
 drop table t3;

=== modified file 'mysql-test/suite/parts/inc/partition_int.inc'
--- a/mysql-test/suite/parts/inc/partition_int.inc	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_int.inc	2008-07-01 18:38:15 +0000
@@ -6,19 +6,23 @@ partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
 show create table t1;
 insert into t1 values (4294967295), (4294967294), (4294967293), (4294967292), (1), (2),
(65535);
+--sorted_result
 select * from t1;
 select * from t1 where a=4294967293;
 delete from t1 where a=4294967293;
+--sorted_result
 select * from t1;
 drop table t1;
 
 eval create table t2 (a int unsigned not null, primary key(a)) engine=$engine 
-partition by key (a) partitions 10;
+partition by key (a) partitions 8;
 show create table t2;
 insert into t2 values (4294967295), (4294967294), (4294967293), (4294967292);
+--sorted_result
 select * from t2;
 select * from t2 where a=4294967293;
 delete from t2 where a=4294967293;
+--sorted_result
 select * from t2;
 delete from t2;
 let $count=$maxrows;
@@ -34,11 +38,13 @@ select count(*) from t2;
 drop table t2;
 
 eval create table t3 (a int not null, primary key(a)) engine=$engine 
-partition by key (a) partitions 10;
+partition by key (a) partitions 7;
 show create table t3;
 insert into t3 values (2147483647), (2147483646), (2147483645), (2147483644),
(-2147483648), (-2147483647), (1), (-1), (0);
+--sorted_result
 select * from t3;
 select * from t3 where a=2147483645;
 delete from t3 where a=2147483645;
+--sorted_result
 select * from t3;
 drop table t3;

=== modified file 'mysql-test/suite/parts/inc/partition_mediumint.inc'
--- a/mysql-test/suite/parts/inc/partition_mediumint.inc	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_mediumint.inc	2008-07-01 18:38:15 +0000
@@ -6,9 +6,11 @@ partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
 show create table t1;
 insert into t1 values (16777215), (16777214), (16777213), (16777212), (1), (2), (65535);
+--sorted_result
 select * from t1;
 select * from t1 where a=16777213;
 delete from t1 where a=16777213;
+--sorted_result
 select * from t1;
 drop table t1;
 
@@ -16,9 +18,11 @@ eval create table t2 (a mediumint unsign
 partition by key (a) partitions 8;
 show create table t2;
 insert into t2 values (16777215), (16777214), (16777213), (16777212);
+--sorted_result
 select * from t2;
 select * from t2 where a=16777213;
 delete from t2 where a=16777213;
+--sorted_result
 select * from t2;
 delete from t2;
 let $count=$maxrows;
@@ -34,11 +38,13 @@ select count(*) from t2;
 drop table t2;
 
 eval create table t3 (a mediumint not null, primary key(a)) engine=$engine 
-partition by key (a) partitions 10;
+partition by key (a) partitions 7;
 show create table t3;
 insert into t3 values (8388607), (8388606), (8388605), (8388604), (-8388608), (-8388607),
(1), (-1), (0);
+--sorted_result
 select * from t3;
 select * from t3 where a=8388605;
 delete from t3 where a=8388605;
+--sorted_result
 select * from t3;
 drop table t3;

=== modified file 'mysql-test/suite/parts/inc/partition_smallint.inc'
--- a/mysql-test/suite/parts/inc/partition_smallint.inc	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_smallint.inc	2008-07-01 18:38:15 +0000
@@ -6,9 +6,11 @@ partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
 show create table t1;
 insert into t1 values (65535), (65534), (65533), (65532), (1), (2), (256);
+--sorted_result
 select * from t1;
 select * from t1 where a=65533;
 delete from t1 where a=65533;
+--sorted_result
 select * from t1;
 drop table t1;
 
@@ -16,9 +18,11 @@ eval create table t2 (a smallint unsigne
 partition by key (a) partitions 8;
 show create table t2;
 insert into t2 values (65535), (65534), (65533), (65532);
+--sorted_result
 select * from t2;
 select * from t2 where a=65533;
 delete from t2 where a=65533;
+--sorted_result
 select * from t2;
 delete from t2;
 let $count=$maxrows;
@@ -34,11 +38,13 @@ select count(*) from t2;
 drop table t2;
 
 eval create table t3 (a smallint not null, primary key(a)) engine=$engine 
-partition by key (a) partitions 10;
+partition by key (a) partitions 7;
 show create table t3;
 insert into t3 values (32767), (32766), (32765), (32764), (-32768), (-32767), (1), (-1),
(0);
+--sorted_result
 select * from t3;
 select * from t3 where a=32765;
 delete from t3 where a=32765;
+--sorted_result
 select * from t3;
 drop table t3;

=== modified file 'mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc'
--- a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc	2007-11-20 15:04:07
+0000
+++ b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc	2008-07-01 18:38:15
+0000
@@ -1,5 +1,6 @@
 ################################################################################
-# t/partition_supported_sql_funcs.inc                                          #         
 #                                                                              #
+# t/partition_supported_sql_funcs.inc                                          #
+#                                                                              #
 # Purpose:                                                                     #
 #  Tests frame for allowed sql functions                                       #
 #                                                                              #
@@ -7,9 +8,10 @@
 #------------------------------------------------------------------------------#
 # Original Author: HH                                                          #
 # Original Date: 2006-11-22                                                    #
-# Change Author:                                                               #
-# Change Date:                                                                 #
-# Change:                                                                      #
+# Change Author: MattiasJ                                                      #
+# Change Date: 2008-05-15                                                      #
+# Change: Added $max_8_partitions since ndb only capable of 8 partitions       #
+#         and $no_reorg_partition since ndb does not support that              #
 ################################################################################
 --echo -------------------------------------------------------------------------
 --echo ---  $sqlfunc  in partition with coltype  $coltype
@@ -25,16 +27,11 @@ drop table if exists t6 ;
 --enable_warnings
 --enable_abort_on_error
 
---echo -------------------------------------------------------------------------
---echo ---  Create tables with $sqlfunc
---echo -------------------------------------------------------------------------
-eval create table t1 (col1 $coltype) engine=$engine 
-partition by range($sqlfunc) 
+let $part_t1= partition by range($sqlfunc) 
 (partition p0 values less than (15),
  partition p1 values less than maxvalue);
 
-eval create table t2 (col1 $coltype) engine=$engine 
-partition by list($sqlfunc) 
+let $part_t2= partition by list($sqlfunc) 
 (partition p0 values in (0,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),
@@ -43,17 +40,14 @@ partition by list($sqlfunc) 
  partition p5 values in (51,52,53,54,55,56,57,58,59,60)
 );
 
-eval create table t3 (col1 $coltype) engine=$engine 
-partition by hash($sqlfunc);
+let $part_t3= partition by hash($sqlfunc);
 
-eval create table t4 (colint int, col1 $coltype) engine=$engine 
-partition by range(colint) 
+let $part_t4= partition by range(colint) 
 subpartition by hash($sqlfunc) subpartitions 2 
 (partition p0 values less than (15),
  partition p1 values less than maxvalue);
 
-eval create table t5 (colint int, col1 $coltype) engine=$engine 
-partition by list(colint)
+let $part_t5= partition by list(colint)
 subpartition by hash($sqlfunc) subpartitions 2 
 (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),
@@ -62,12 +56,59 @@ subpartition by hash($sqlfunc) subpartit
  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)
 );
+if ($max_8_partitions)
+{
+let $part_t5= partition by list(colint) 
+subpartition by hash($sqlfunc) subpartitions 2 
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+ partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+ partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+ partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+}
 
-eval create table t6 (colint int, col1 $coltype) engine=$engine 
-partition by range(colint) 
+let $part_t6= partition by range(colint) 
 (partition p0 values less than ($valsqlfunc),
  partition p1 values less than maxvalue);
 
+let $part_t55_altered= 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)
+);
+if ($max_8_partitions)
+{
+let $part_t55_altered= partition by list(colint) 
+subpartition by hash($sqlfunc) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+ partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+}
+--echo -------------------------------------------------------------------------
+--echo ---  Create tables with $sqlfunc
+--echo -------------------------------------------------------------------------
+eval create table t1 (col1 $coltype) engine=$engine 
+$part_t1;
+
+eval create table t2 (col1 $coltype) engine=$engine 
+$part_t2;
+
+eval create table t3 (col1 $coltype) engine=$engine 
+$part_t3;
+
+eval create table t4 (colint int, col1 $coltype) engine=$engine 
+$part_t4;
+
+eval create table t5 (colint int, col1 $coltype) engine=$engine 
+$part_t5;
+
+eval create table t6 (colint int, col1 $coltype) engine=$engine 
+$part_t6;
+
 --echo -------------------------------------------------------------------------
 --echo ---  Access tables with $sqlfunc 
 --echo -------------------------------------------------------------------------
@@ -135,39 +176,17 @@ eval create table t44 engine=$engine as 
 eval create table t55 engine=$engine as select * from t5;
 eval create table t66 engine=$engine as select * from t6;
 eval alter table t11
-partition by range($sqlfunc) 
-(partition p0 values less than (15),
- partition p1 values less than maxvalue);
+$part_t1;
 eval alter table t22
-partition by list($sqlfunc) 
-(partition p0 values in (0,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)
-);
+$part_t2;
 eval alter table t33
-partition by hash($sqlfunc);
+$part_t3;
 eval alter table t44
-partition by range(colint) 
-subpartition by hash($sqlfunc) subpartitions 2 
-(partition p0 values less than (15),
- partition p1 values less than maxvalue);
+$part_t4;
 eval alter table t55
-partition by list(colint)
-subpartition by hash($sqlfunc) subpartitions 2 
-(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)
-);
+$part_t5;
 eval alter table t66
-partition by range(colint) 
-(partition p0 values less than ($valsqlfunc),
- partition p1 values less than maxvalue);
+$part_t6;
 
 select * from t11 order by col1;
 select * from t22 order by col1;
@@ -181,51 +200,49 @@ 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 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 order by col1;
+        if (!$no_reorg_partition)
+        {
+        eval alter table t11
+        reorganize partition p0,p1 into
+        (partition s1 values less than maxvalue);
+        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 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)
-);
+$part_t55_altered;
         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 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 order by colint;
+        if (!$no_reorg_partition)
+        {
+        eval alter table t66
+        reorganize partition p0,p1 into
+        (partition s1 values less than maxvalue);
+        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 order by colint;
 	
-	eval alter table t66
+        eval alter table t66
         reorganize partition p0,p1 into
         (partition s1 values less than maxvalue);
         select * from t66 order by colint;
 
-	eval alter table t66
+        eval alter table t66
         reorganize partition s1 into
-	(partition p0 values less than ($valsqlfunc),
-	 partition p1 values less than maxvalue);
+        (partition p0 values less than ($valsqlfunc),
+         partition p1 values less than maxvalue);
         select * from t66 order by colint;
+        }
 
 	let $t1=t1;
 	let $t2=t2;

=== modified file 'mysql-test/suite/parts/inc/partition_tinyint.inc'
--- a/mysql-test/suite/parts/inc/partition_tinyint.inc	2008-02-06 14:13:56 +0000
+++ b/mysql-test/suite/parts/inc/partition_tinyint.inc	2008-07-01 18:38:15 +0000
@@ -6,9 +6,11 @@ partition pa3 max_rows=30 min_rows=4,
 partition pa4 max_rows=40 min_rows=2);
 show create table t1;
 insert into t1 values (255), (254), (253), (252), (1), (2), (128);
+--sorted_result
 select * from t1;
 select * from t1 where a=253;
 delete from t1 where a=253;
+--sorted_result
 select * from t1;
 drop table t1;
 
@@ -16,9 +18,11 @@ eval create table t2 (a tinyint unsigned
 partition by key (a) partitions 8;
 show create table t2;
 insert into t2 values (255), (254), (253), (252);
+--sorted_result
 select * from t2;
 select * from t2 where a=253;
 delete from t2 where a=253;
+--sorted_result
 select * from t2;
 delete from t2;
 let $count=255;
@@ -34,11 +38,13 @@ select count(*) from t2;
 drop table t2;
 
 eval create table t3 (a tinyint not null, primary key(a)) engine=$engine 
-partition by key (a) partitions 10;
+partition by key (a) partitions 7;
 show create table t3;
 insert into t3 values (127), (126), (125), (124), (-128), (-127), (1), (-1), (0);
+--sorted_result
 select * from t3;
 select * from t3 where a=125;
 delete from t3 where a=125;
+--sorted_result
 select * from t3;
 drop table t3;

=== removed file 'mysql-test/suite/parts/r/ndb_blob_partition.result'
--- a/mysql-test/suite/parts/r/ndb_blob_partition.result	2007-04-30 14:24:13 +0000
+++ b/mysql-test/suite/parts/r/ndb_blob_partition.result	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-drop table if exists t1;
-create table t1 (
-a mediumint not null,
-b text not null,
-c int not null,
-d longblob,
-primary key using hash (a,c),
-unique key (c)
-)
-engine=ndb
-partition by range (c)
-partitions 3
-( partition p1 values less than (200),
-partition p2 values less than (300),
-partition p3 values less than (400));
-insert into t1 values (1, @v1, 101, @v2);
-insert into t1 values (1, @v2, 102, @v3);
-insert into t1 values (1, @v3, 103, @v4);
-insert into t1 values (2, @v4, 201, @v5);
-insert into t1 values (2, @v5, 202, @v6);
-insert into t1 values (2, @v6, 203, @v7);
-insert into t1 values (3, @v7, 301, @v8);
-insert into t1 values (3, @v8, 302, @v9);
-insert into t1 values (3, @v9, 303, @v1);
-select a, sha1(b), c, sha1(d) from t1 order by a;
-a	sha1(b)	c	sha1(d)
-1	1d42dd9090cf78314a06665d4ea938c35cc760f4	101	10d3c783026b310218d10b7188da96a2401648c6
-1	10d3c783026b310218d10b7188da96a2401648c6	102	a33549d9844092289a58ac348dd59f09fc28406a
-1	a33549d9844092289a58ac348dd59f09fc28406a	103	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c
-2	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c	201	70fc9a7d08beebc522258bfb02000a30c77a8f1d
-2	70fc9a7d08beebc522258bfb02000a30c77a8f1d	202	090565c580809efed3d369481a4bbb168b20713e
-2	090565c580809efed3d369481a4bbb168b20713e	203	1e0070bec426871a46291de27b9bd6e4255ab4e5
-3	1e0070bec426871a46291de27b9bd6e4255ab4e5	301	acbaba01bc2e682f015f40e79d9cbe475db3002e
-3	acbaba01bc2e682f015f40e79d9cbe475db3002e	302	9ee30d99162574f79c66ae95cdf132dcf9cbc259
-3	9ee30d99162574f79c66ae95cdf132dcf9cbc259	303	1d42dd9090cf78314a06665d4ea938c35cc760f4
-select a, sha1(b), c, sha1(d) from t1 where a = 1 and c = 101;
-a	sha1(b)	c	sha1(d)
-1	1d42dd9090cf78314a06665d4ea938c35cc760f4	101	10d3c783026b310218d10b7188da96a2401648c6
-select a, sha1(b), c, sha1(d) from t1 where a = 2 and c = 201;
-a	sha1(b)	c	sha1(d)
-2	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c	201	70fc9a7d08beebc522258bfb02000a30c77a8f1d
-select a, sha1(b), c, sha1(d) from t1 where a = 3 and c = 301;
-a	sha1(b)	c	sha1(d)
-3	1e0070bec426871a46291de27b9bd6e4255ab4e5	301	acbaba01bc2e682f015f40e79d9cbe475db3002e
-update t1 set b = @v3, d = @v4 where a = 1 and c = 102;
-update t1 set b = @v6, d = @v7 where a = 2 and c = 202;
-update t1 set b = @v9, d = @v1 where a = 3 and c = 302;
-select a, sha1(b), c, sha1(d) from t1 order by a;
-a	sha1(b)	c	sha1(d)
-1	1d42dd9090cf78314a06665d4ea938c35cc760f4	101	10d3c783026b310218d10b7188da96a2401648c6
-1	a33549d9844092289a58ac348dd59f09fc28406a	102	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c
-1	a33549d9844092289a58ac348dd59f09fc28406a	103	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c
-2	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c	201	70fc9a7d08beebc522258bfb02000a30c77a8f1d
-2	090565c580809efed3d369481a4bbb168b20713e	202	1e0070bec426871a46291de27b9bd6e4255ab4e5
-2	090565c580809efed3d369481a4bbb168b20713e	203	1e0070bec426871a46291de27b9bd6e4255ab4e5
-3	1e0070bec426871a46291de27b9bd6e4255ab4e5	301	acbaba01bc2e682f015f40e79d9cbe475db3002e
-3	9ee30d99162574f79c66ae95cdf132dcf9cbc259	302	1d42dd9090cf78314a06665d4ea938c35cc760f4
-3	9ee30d99162574f79c66ae95cdf132dcf9cbc259	303	1d42dd9090cf78314a06665d4ea938c35cc760f4
-update t1 set b = @v4, d = @v5 where c = 103;
-update t1 set b = @v7, d = @v8 where c = 203;
-update t1 set b = @v1, d = @v2 where c = 303;
-select a, sha1(b), c, sha1(d) from t1 order by a;
-a	sha1(b)	c	sha1(d)
-1	1d42dd9090cf78314a06665d4ea938c35cc760f4	101	10d3c783026b310218d10b7188da96a2401648c6
-1	a33549d9844092289a58ac348dd59f09fc28406a	102	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c
-1	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c	103	70fc9a7d08beebc522258bfb02000a30c77a8f1d
-2	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c	201	70fc9a7d08beebc522258bfb02000a30c77a8f1d
-2	090565c580809efed3d369481a4bbb168b20713e	202	1e0070bec426871a46291de27b9bd6e4255ab4e5
-2	1e0070bec426871a46291de27b9bd6e4255ab4e5	203	acbaba01bc2e682f015f40e79d9cbe475db3002e
-3	1e0070bec426871a46291de27b9bd6e4255ab4e5	301	acbaba01bc2e682f015f40e79d9cbe475db3002e
-3	9ee30d99162574f79c66ae95cdf132dcf9cbc259	302	1d42dd9090cf78314a06665d4ea938c35cc760f4
-3	1d42dd9090cf78314a06665d4ea938c35cc760f4	303	10d3c783026b310218d10b7188da96a2401648c6
-update t1 set b = @v5, d = @v6;
-select a, sha1(b), c, sha1(d) from t1 order by a;
-a	sha1(b)	c	sha1(d)
-1	70fc9a7d08beebc522258bfb02000a30c77a8f1d	101	090565c580809efed3d369481a4bbb168b20713e
-1	70fc9a7d08beebc522258bfb02000a30c77a8f1d	102	090565c580809efed3d369481a4bbb168b20713e
-1	70fc9a7d08beebc522258bfb02000a30c77a8f1d	103	090565c580809efed3d369481a4bbb168b20713e
-2	70fc9a7d08beebc522258bfb02000a30c77a8f1d	201	090565c580809efed3d369481a4bbb168b20713e
-2	70fc9a7d08beebc522258bfb02000a30c77a8f1d	202	090565c580809efed3d369481a4bbb168b20713e
-2	70fc9a7d08beebc522258bfb02000a30c77a8f1d	203	090565c580809efed3d369481a4bbb168b20713e
-3	70fc9a7d08beebc522258bfb02000a30c77a8f1d	301	090565c580809efed3d369481a4bbb168b20713e
-3	70fc9a7d08beebc522258bfb02000a30c77a8f1d	302	090565c580809efed3d369481a4bbb168b20713e
-3	70fc9a7d08beebc522258bfb02000a30c77a8f1d	303	090565c580809efed3d369481a4bbb168b20713e
-update t1 set b = @v1, d = @v2 where 100 < c and c < 200;
-update t1 set b = @v4, d = @v5 where 200 < c and c < 300;
-update t1 set b = @v7, d = @v8 where 300 < c and c < 400;
-select a, sha1(b), c, sha1(d) from t1 order by a;
-a	sha1(b)	c	sha1(d)
-1	1d42dd9090cf78314a06665d4ea938c35cc760f4	101	10d3c783026b310218d10b7188da96a2401648c6
-1	1d42dd9090cf78314a06665d4ea938c35cc760f4	102	10d3c783026b310218d10b7188da96a2401648c6
-1	1d42dd9090cf78314a06665d4ea938c35cc760f4	103	10d3c783026b310218d10b7188da96a2401648c6
-2	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c	201	70fc9a7d08beebc522258bfb02000a30c77a8f1d
-2	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c	202	70fc9a7d08beebc522258bfb02000a30c77a8f1d
-2	daa61c6de36a0526f0d47dc29d6b9de7e6d2630c	203	70fc9a7d08beebc522258bfb02000a30c77a8f1d
-3	1e0070bec426871a46291de27b9bd6e4255ab4e5	301	acbaba01bc2e682f015f40e79d9cbe475db3002e
-3	1e0070bec426871a46291de27b9bd6e4255ab4e5	302	acbaba01bc2e682f015f40e79d9cbe475db3002e
-3	1e0070bec426871a46291de27b9bd6e4255ab4e5	303	acbaba01bc2e682f015f40e79d9cbe475db3002e
-delete from t1 where a = 1 and c = 101;
-delete from t1 where c = 102;
-delete from t1;
-select a, sha1(b), c, sha1(d) from t1 order by a;
-a	sha1(b)	c	sha1(d)
-drop table t1;

=== modified file 'mysql-test/suite/parts/r/ndb_dd_backuprestore.result'
--- a/mysql-test/suite/parts/r/ndb_dd_backuprestore.result	2007-04-30 14:24:13 +0000
+++ b/mysql-test/suite/parts/r/ndb_dd_backuprestore.result	2008-07-01 18:38:15 +0000
@@ -175,7 +175,7 @@ t1	CREATE TABLE `t1` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION
BY HASH (c3) PARTITIONS 4 
+) /*!50100 TABLESPACE table_space1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT
CHARSET=latin1 /*!50100 PARTITION BY HASH (c3) PARTITIONS 4  */
 SHOW CREATE TABLE test.t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -184,7 +184,7 @@ t2	CREATE TABLE `t2` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION
BY KEY (c3) (PARTITION p0  ENGINE = ndbcluster, PARTITION p1  ENGINE = ndbcluster)
+) /*!50100 TABLESPACE table_space2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT
CHARSET=latin1 /*!50100 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster,
PARTITION p1 ENGINE = ndbcluster) */
 SHOW CREATE TABLE test.t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
@@ -193,7 +193,7 @@ t3	CREATE TABLE `t3` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION
BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2
VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE =
ndbcluster)
+) /*!50100 TABLESPACE table_space2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT
CHARSET=latin1 /*!50100 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105)
ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION
x3 VALUES LESS THAN (720) ENGINE = ndbcluster) */
 SHOW CREATE TABLE test.t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
@@ -202,7 +202,7 @@ t4	CREATE TABLE `t4` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (c3) PARTITIONS 2 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (c3) PARTITIONS 2 
*/
 SHOW CREATE TABLE test.t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
@@ -211,7 +211,7 @@ t5	CREATE TABLE `t5` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (pk1) (PARTITION p0  ENGINE =
ndbcluster, PARTITION p1  ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (pk1) (PARTITION p0
ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) */
 SHOW CREATE TABLE test.t6;
 Table	Create Table
 t6	CREATE TABLE `t6` (
@@ -220,34 +220,34 @@ t6	CREATE TABLE `t6` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (pk1) (PARTITION x1 VALUES
LESS THAN (333) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (720) ENGINE =
ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (pk1) (PARTITION
x1 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (720) ENGINE
= ndbcluster) */
 SELECT * FROM information_schema.partitions WHERE table_name= 't1';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t1	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t1	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t1	p2	NULL	3	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t1	p3	NULL	4	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t1	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p2	NULL	3	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p3	NULL	4	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
 SELECT * FROM information_schema.partitions WHERE table_name= 't2';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t2	p0	NULL	1	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t2	p1	NULL	2	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t2	p0	NULL	1	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t2	p1	NULL	2	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
 SELECT * FROM information_schema.partitions WHERE table_name= 't3';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t3	x1	NULL	1	NULL	RANGE	NULL	c3	NULL	105	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t3	x2	NULL	2	NULL	RANGE	NULL	c3	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t3	x3	NULL	3	NULL	RANGE	NULL	c3	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t3	x1	NULL	1	NULL	RANGE	NULL	c3	NULL	105	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t3	x2	NULL	2	NULL	RANGE	NULL	c3	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t3	x3	NULL	3	NULL	RANGE	NULL	c3	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
 SELECT * FROM information_schema.partitions WHERE table_name= 't4';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t4	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t4	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t4	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t4	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT * FROM information_schema.partitions WHERE table_name= 't5';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t5	p0	NULL	1	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t5	p1	NULL	2	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t5	p0	NULL	1	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t5	p1	NULL	2	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT * FROM information_schema.partitions WHERE table_name= 't6';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t6	x1	NULL	1	NULL	RANGE	NULL	pk1	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t6	x2	NULL	2	NULL	RANGE	NULL	pk1	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t6	x1	NULL	1	NULL	RANGE	NULL	pk1	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t6	x2	NULL	2	NULL	RANGE	NULL	pk1	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT COUNT(*) FROM test.t1;
 COUNT(*)
 250
@@ -341,7 +341,7 @@ t1	CREATE TABLE `t1` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION
BY HASH (c3) PARTITIONS 4 
+) /*!50100 TABLESPACE table_space1 STORAGE DISK */ ENGINE=ndbcluster DEFAULT
CHARSET=latin1 /*!50100 PARTITION BY HASH (c3) PARTITIONS 4  */
 SHOW CREATE TABLE test.t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -350,7 +350,7 @@ t2	CREATE TABLE `t2` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION
BY KEY (c3) (PARTITION p0  ENGINE = ndbcluster, PARTITION p1  ENGINE = ndbcluster)
+) /*!50100 TABLESPACE table_space2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT
CHARSET=latin1 /*!50100 PARTITION BY KEY (c3) (PARTITION p0 ENGINE = ndbcluster,
PARTITION p1 ENGINE = ndbcluster) */
 SHOW CREATE TABLE test.t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
@@ -359,7 +359,7 @@ t3	CREATE TABLE `t3` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) TABLESPACE table_space2 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION
BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105) ENGINE = ndbcluster, PARTITION x2
VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (720) ENGINE =
ndbcluster)
+) /*!50100 TABLESPACE table_space2 STORAGE DISK */ ENGINE=ndbcluster DEFAULT
CHARSET=latin1 /*!50100 PARTITION BY RANGE (c3) (PARTITION x1 VALUES LESS THAN (105)
ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION
x3 VALUES LESS THAN (720) ENGINE = ndbcluster) */
 SHOW CREATE TABLE test.t4;
 Table	Create Table
 t4	CREATE TABLE `t4` (
@@ -368,7 +368,7 @@ t4	CREATE TABLE `t4` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (c3) PARTITIONS 2 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (c3) PARTITIONS 2 
*/
 SHOW CREATE TABLE test.t5;
 Table	Create Table
 t5	CREATE TABLE `t5` (
@@ -377,7 +377,7 @@ t5	CREATE TABLE `t5` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (pk1) (PARTITION p0  ENGINE =
ndbcluster, PARTITION p1  ENGINE = ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (pk1) (PARTITION p0
ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) */
 SHOW CREATE TABLE test.t6;
 Table	Create Table
 t6	CREATE TABLE `t6` (
@@ -386,34 +386,34 @@ t6	CREATE TABLE `t6` (
   `c3` int(11) NOT NULL,
   `c4` bit(1) NOT NULL,
   PRIMARY KEY (`pk1`,`c3`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (pk1) (PARTITION x1 VALUES
LESS THAN (333) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (720) ENGINE =
ndbcluster)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (pk1) (PARTITION
x1 VALUES LESS THAN (333) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (720) ENGINE
= ndbcluster) */
 SELECT * FROM information_schema.partitions WHERE table_name= 't1';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t1	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t1	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t1	p2	NULL	3	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t1	p3	NULL	4	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t1	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p2	NULL	3	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
+NULL	test	t1	p3	NULL	4	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space1
 SELECT * FROM information_schema.partitions WHERE table_name= 't2';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t2	p0	NULL	1	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t2	p1	NULL	2	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t2	p0	NULL	1	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t2	p1	NULL	2	NULL	KEY	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
 SELECT * FROM information_schema.partitions WHERE table_name= 't3';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t3	x1	NULL	1	NULL	RANGE	NULL	c3	NULL	105	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t3	x2	NULL	2	NULL	RANGE	NULL	c3	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t3	x3	NULL	3	NULL	RANGE	NULL	c3	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t3	x1	NULL	1	NULL	RANGE	NULL	c3	NULL	105	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t3	x2	NULL	2	NULL	RANGE	NULL	c3	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
+NULL	test	t3	x3	NULL	3	NULL	RANGE	NULL	c3	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	table_space2
 SELECT * FROM information_schema.partitions WHERE table_name= 't4';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t4	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t4	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t4	p0	NULL	1	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t4	p1	NULL	2	NULL	HASH	NULL	c3	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT * FROM information_schema.partitions WHERE table_name= 't5';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t5	p0	NULL	1	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t5	p1	NULL	2	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t5	p0	NULL	1	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t5	p1	NULL	2	NULL	KEY	NULL	pk1	NULL	NULL	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT * FROM information_schema.partitions WHERE table_name= 't6';
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t6	x1	NULL	1	NULL	RANGE	NULL	pk1	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
-NULL	test	t6	x2	NULL	2	NULL	RANGE	NULL	pk1	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL	default	0	default
+NULL	test	t6	x1	NULL	1	NULL	RANGE	NULL	pk1	NULL	333	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
+NULL	test	t6	x2	NULL	2	NULL	RANGE	NULL	pk1	NULL	720	0	0	0	NULL	0	0	NULL	NULL	NULL	NULL		default	NULL
 SELECT COUNT(*) FROM test.t1;
 COUNT(*)
 250

=== removed file 'mysql-test/suite/parts/r/ndb_partition_error.result'
--- a/mysql-test/suite/parts/r/ndb_partition_error.result	2007-04-30 14:24:13 +0000
+++ b/mysql-test/suite/parts/r/ndb_partition_error.result	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-drop table if exists t1;
-CREATE TABLE t1 (
-a int not null,
-b int not null,
-c int not null,
-primary key(a,b),
-index (a))
-engine = ndb
-partition by range (a)
-partitions 3
-(partition x1 values less than (5) nodegroup 12,
-partition x2 values less than (10) nodegroup 13,
-partition x3 values less than (20) nodegroup 14);
-ERROR HY000: Can't create table 'test.t1' (errno: 140)
-show warnings;
-Level	Code	Message
-Error	1296	Got error 771 'Given NODEGROUP doesn't exist in this cluster' from NDB
-Error	1005	Can't create table 'test.t1' (errno: 140)
-CREATE TABLE t1 (
-a int not null,
-b int not null,
-c int not null,
-primary key(a))
-engine = ndb
-partition by range (a)
-partitions 3
-(partition x1 values less than (5),
-partition x2 values less than (10),
-partition x3 values less than (20));
-drop table t1;
-CREATE TABLE t1 (id INT) ENGINE=NDB
-PARTITION BY LIST(id)
-(PARTITION p0 VALUES IN (2, 4),
-PARTITION p1 VALUES IN (42, 142));
-INSERT INTO t1 VALUES (2);
-UPDATE t1 SET id=5 WHERE id=2;
-ERROR HY000: Table has no partition for value 5
-DROP TABLE t1;
-create table t1 (a int,b int, c int)
-engine = ndb
-partition by list(a)
-partitions 2
-(partition x123 values in (11, 12),
-partition x234 values in (5, 1));
-insert into t1 values (NULL,1,1);
-ERROR HY000: Table has no partition for value NULL
-drop table t1;

=== removed file 'mysql-test/suite/parts/r/ndb_partition_key.result'
--- a/mysql-test/suite/parts/r/ndb_partition_key.result	2008-01-09 12:15:50 +0000
+++ b/mysql-test/suite/parts/r/ndb_partition_key.result	1970-01-01 00:00:00 +0000
@@ -1,206 +0,0 @@
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (a int, b int, c int, d int, PRIMARY KEY(a,b,c))
-ENGINE = NDB
-PARTITION BY KEY (a,b);
-insert into t1 values (1,1,1,1);
-select * from t1;
-a	b	c	d
-1	1	1	1
-update t1 set d = 2 where a = 1 and b = 1 and c = 1;
-select * from t1;
-a	b	c	d
-1	1	1	2
-delete from t1;
-select * from t1;
-a	b	c	d
-drop table t1;
-CREATE TABLE t1 (a int, b int, c int, d int, PRIMARY KEY(a,b))
-ENGINE = NDB
-PARTITION BY KEY (c);
-ERROR HY000: A PRIMARY KEY must include all columns in the table's partitioning function
-CREATE TABLE t1 (a int, b int, c int, PRIMARY KEY(a,b))
-ENGINE = NDB
-PARTITION BY KEY (a);
-insert into t1 values 
-(1,1,3),(1,2,3),(1,3,3),(1,4,3),(1,5,3),(1,6,3),
-(1,7,3),(1,8,3),(1,9,3),(1,10,3),(1,11,3),(1,12,3);
-select * from t1 order by b;
-a	b	c
-1	1	3
-1	2	3
-1	3	3
-1	4	3
-1	5	3
-1	6	3
-1	7	3
-1	8	3
-1	9	3
-1	10	3
-1	11	3
-1	12	3
-DROP TABLE t1;
-CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,
-PRIMARY KEY (a,b,c) USING HASH)
-ENGINE=NDB
-DEFAULT CHARSET=latin1
-PARTITION BY KEY (b);
-insert into t1 values (1,"a",1,1),(2,"a",1,1),(3,"a",1,1);
--- t1 --
-
-Fragment type: 5
-K Value: 6
-Min load factor: 78
-Max load factor: 80
-Temporary table: no
-Number of attributes: 4
-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
-b Char(10;latin1_bin) PRIMARY KEY DISTRIBUTION KEY AT=FIXED ST=MEMORY
-c Int PRIMARY KEY AT=FIXED ST=MEMORY
-d Int NULL AT=FIXED ST=MEMORY
-
--- Indexes -- 
-PRIMARY KEY(a, b, c) - UniqueHashIndex
-
-
-NDBT_ProgramExit: 0 - OK
-
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) NOT NULL DEFAULT '0',
-  `b` char(10) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',
-  `c` int(11) NOT NULL DEFAULT '0',
-  `d` int(11) DEFAULT NULL,
-  PRIMARY KEY (`a`,`b`,`c`) USING HASH
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (b)  */
-DROP TABLE t1;
-CREATE TABLE t1 (a int not null primary key)
-PARTITION BY KEY(a)
-(PARTITION p0 ENGINE = NDB, PARTITION p1 ENGINE = NDB);
-drop table t1;
-CREATE TABLE t1 (a int not null primary key);
-ALTER TABLE t1
-ENGINE = NDB
-PARTITION BY KEY(a)
-(PARTITION p0 ENGINE = NDB, PARTITION p1 ENGINE = NDB);
-drop table t1;
-CREATE TABLE t1 (a int not null primary key) ENGINE = NDB;
-ALTER TABLE t1
-PARTITION BY KEY(a)
-(PARTITION p0 ENGINE = NDB, PARTITION p1 ENGINE = NDB);
-drop table t1;
-create table t1 (a int)
-engine=ndb
-partition by key(a)
-(partition p0, partition p1);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0
ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) */
-alter table t1 engine=heap;
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0 ENGINE
= MEMORY, PARTITION p1 ENGINE = MEMORY) */
-alter table t1 engine=ndb;
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0
ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) */
-alter table t1 engine=heap remove partitioning;
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=latin1
-alter table t1 engine=ndb
-partition by key(a)
-(partition p0, partition p1 engine = ndb);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0
ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) */
-alter table t1
-partition by key (a)
-(partition p0 engine=ndb, partition p1 engine=ndb);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0
ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) */
-alter table t1 remove partitioning;
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1
-alter table t1
-partition by key(a)
-(partition p0 engine=ndb, partition p1);
-alter table t1
-engine=ndb
-partition by key(a)
-(partition p0 engine=ndb, partition p1 engine = ndb);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a) (PARTITION p0
ENGINE = ndbcluster, PARTITION p1 ENGINE = ndbcluster) */
-drop table t1;
-CREATE TABLE t1 (
-c1 MEDIUMINT NOT NULL AUTO_INCREMENT,
-c2 TEXT NOT NULL,
-c3 INT NOT NULL,
-c4 BIT NOT NULL,
-c5 FLOAT,
-c6 VARCHAR(255),
-c7 TIMESTAMP,
-PRIMARY KEY(c1,c3))
-ENGINE=NDB
-PARTITION BY KEY(c3) PARTITIONS 5;
-ALTER TABLE t1 COALESCE PARTITION 4;
-DROP TABLE t1;
-CREATE TABLE t1 (a int primary key)
-ENGINE=NDB
-PARTITION BY KEY(a);
-ALTER TABLE t1 OPTIMIZE PARTITION p0;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-ALTER TABLE t1 CHECK PARTITION p0;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-ALTER TABLE t1 REPAIR PARTITION p0;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-ALTER TABLE t1 ANALYZE PARTITION p0;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-ALTER TABLE t1 REBUILD PARTITION p0;
-ERROR HY000: Table storage engine for 't1' doesn't have this option
-DROP TABLE t1;
-CREATE TABLE t1 (
-c1 MEDIUMINT NOT NULL AUTO_INCREMENT,
-c2 TEXT NOT NULL,
-c3 INT NOT NULL,
-PRIMARY KEY(c1,c3))
-ENGINE=NDB
-PARTITION BY KEY(c3) PARTITIONS 5;
-ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;
-DROP TABLE t1;
-CREATE TABLE t1 (
-c1 MEDIUMINT NOT NULL AUTO_INCREMENT,
-c2 TEXT NOT NULL,
-c3 INT NOT NULL,
-PRIMARY KEY(c1,c3))
-ENGINE=NDB
-PARTITION BY KEY(c3);
-ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;
-DROP TABLE t1;

=== removed file 'mysql-test/suite/parts/r/ndb_partition_list.result'
--- a/mysql-test/suite/parts/r/ndb_partition_list.result	2007-04-30 14:24:13 +0000
+++ b/mysql-test/suite/parts/r/ndb_partition_list.result	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-drop table if exists t1;
-CREATE TABLE t1 ( f_int1 INTEGER NOT NULL, f_int2 INTEGER NOT NULL, 
-f_char1 CHAR(10),
-f_char2 CHAR(10), f_charbig VARCHAR(1000),
-PRIMARY KEY (f_int1,f_int2))
-ENGINE = NDB
-PARTITION BY LIST(MOD(f_int1 + f_int2,4)) 
-(PARTITION part_3 VALUES IN (-3),
-PARTITION part_2 VALUES IN (-2),
-PARTITION part_1 VALUES IN (-1),
-PARTITION part0 VALUES IN (0),
-PARTITION part1 VALUES IN (1),
-PARTITION part2 VALUES IN (2),
-PARTITION part3 VALUES IN (3,4,5));
-INSERT INTO t1 SET f_int1 = -2, f_int2 = 20, f_char1 = '20', f_char2 = '20', f_charbig =
'===20===';
-INSERT INTO t1 SET f_int1 = 1, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-INSERT INTO t1 SET f_int1 = 2, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-INSERT INTO t1 SET f_int1 = 3, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-INSERT INTO t1 SET f_int1 = 4, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-INSERT INTO t1 SET f_int1 = 5, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-INSERT INTO t1 SET f_int1 = 20, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-SELECT * FROM t1 ORDER BY f_int1;
-f_int1	f_int2	f_char1	f_char2	f_charbig
--2	20	20	20	===20===
-1	1	1	1	===1===
-2	1	1	1	===1===
-3	1	1	1	===1===
-4	1	1	1	===1===
-5	1	1	1	===1===
-20	1	1	1	===1===
-DROP TABLE t1;
-CREATE TABLE t1 ( f_int1 INTEGER, f_int2 INTEGER, f_char1 CHAR(10), 
-f_char2 CHAR(10), f_charbig VARCHAR(1000))
-ENGINE = NDB
-PARTITION BY LIST(f_int1) 
-(PARTITION part_1 VALUES IN (-1),
-PARTITION part0 VALUES IN (0,1),
-PARTITION part1 VALUES IN (2));
-INSERT INTO t1 SET f_int1 = -1, f_int2 = 20, f_char1 = '20', f_char2 = '20', f_charbig =
'===20===';
-INSERT INTO t1 SET f_int1 = 0, f_int2 = 20, f_char1 = '20', f_char2 = '20', f_charbig =
'===20===';
-INSERT INTO t1 SET f_int1 = 1, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-INSERT INTO t1 SET f_int1 = 2, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-INSERT INTO t1 SET f_int1 = 20, f_int2 = 1, f_char1 = '1', f_char2 = '1', f_charbig =
'===1===';
-ERROR HY000: Table has no partition for value 20
-SELECT * FROM t1 ORDER BY f_int1;
-f_int1	f_int2	f_char1	f_char2	f_charbig
--1	20	20	20	===20===
-0	20	20	20	===20===
-1	1	1	1	===1===
-2	1	1	1	===1===
-DROP TABLE t1;

=== removed file 'mysql-test/suite/parts/r/ndb_partition_range.result'
--- a/mysql-test/suite/parts/r/ndb_partition_range.result	2007-04-30 14:24:13 +0000
+++ b/mysql-test/suite/parts/r/ndb_partition_range.result	1970-01-01 00:00:00 +0000
@@ -1,263 +0,0 @@
-drop table if exists t1;
-CREATE TABLE t1 (
-a int not null,
-b int not null,
-c int not null,
-primary key(a,b),
-index (a))
-engine = ndb
-partition by range (a)
-partitions 3
-(partition x1 values less than (5),
-partition x2 values less than (10),
-partition x3 values less than (20));
-INSERT into t1 values (1, 1, 1);
-INSERT into t1 values (6, 1, 1);
-INSERT into t1 values (10, 1, 1);
-INSERT into t1 values (15, 1, 1);
-select * from information_schema.partitions where table_name= 't1';
-TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	SUBPARTITION_NAME	PARTITION_ORDINAL_POSITION	SUBPARTITION_ORDINAL_POSITION	PARTITION_METHOD	SUBPARTITION_METHOD	PARTITION_EXPRESSION	SUBPARTITION_EXPRESSION	PARTITION_DESCRIPTION	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	CREATE_TIME	UPDATE_TIME	CHECK_TIME	CHECKSUM	PARTITION_COMMENT	NODEGROUP	TABLESPACE_NAME
-NULL	test	t1	x1	NULL	1	NULL	RANGE	NULL	a	NULL	5	0	0	0	#	0	0	#	#	NULL	NULL	default	0	default
-NULL	test	t1	x2	NULL	2	NULL	RANGE	NULL	a	NULL	10	0	0	0	#	0	0	#	#	NULL	NULL	default	0	default
-NULL	test	t1	x3	NULL	3	NULL	RANGE	NULL	a	NULL	20	0	0	0	#	0	0	#	#	NULL	NULL	default	0	default
-select * from t1 order by a;
-a	b	c
-1	1	1
-6	1	1
-10	1	1
-15	1	1
-select * from t1 where a=1 order by a;
-a	b	c
-1	1	1
-select * from t1 where a=15 and b=1 order by a;
-a	b	c
-15	1	1
-select * from t1 where a=21 and b=1 order by a;
-a	b	c
-select * from t1 where a=21 order by a;
-a	b	c
-select * from t1 where a in (1,6,10,21) order by a;
-a	b	c
-1	1	1
-6	1	1
-10	1	1
-select * from t1 where b=1 and a in (1,6,10,21) order by a;
-a	b	c
-1	1	1
-6	1	1
-10	1	1
-drop table t1;
-CREATE TABLE t1 (
-a int not null,
-b int not null,
-c int not null,
-primary key(b),
-unique (a))
-engine = ndb
-partition by range (b)
-partitions 3
-(partition x1 values less than (5),
-partition x2 values less than (10),
-partition x3 values less than (20));
-INSERT into t1 values (1, 1, 1);
-INSERT into t1 values (2, 6, 1);
-INSERT into t1 values (3, 10, 1);
-INSERT into t1 values (4, 15, 1);
-select * from t1 order by a;
-a	b	c
-1	1	1
-2	6	1
-3	10	1
-4	15	1
-UPDATE t1 set a = 5 WHERE b = 15;
-select * from t1 order by a;
-a	b	c
-1	1	1
-2	6	1
-3	10	1
-5	15	1
-UPDATE t1 set a = 6 WHERE a = 5;
-select * from t1 order by a;
-a	b	c
-1	1	1
-2	6	1
-3	10	1
-6	15	1
-select * from t1 where b=1 order by b;
-a	b	c
-1	1	1
-select * from t1 where b=15 and a=1 order by b;
-a	b	c
-select * from t1 where b=21 and a=1 order by b;
-a	b	c
-select * from t1 where b=21 order by b;
-a	b	c
-select * from t1 where b in (1,6,10,21) order by b;
-a	b	c
-1	1	1
-2	6	1
-3	10	1
-select * from t1 where a in (1,2,5,6) order by b;
-a	b	c
-1	1	1
-2	6	1
-6	15	1
-select * from t1 where a=1 and b in (1,6,10,21) order by b;
-a	b	c
-1	1	1
-DELETE from t1 WHERE b = 6;
-DELETE from t1 WHERE a = 6;
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` int(11) NOT NULL,
-  `b` int(11) NOT NULL,
-  `c` int(11) NOT NULL,
-  PRIMARY KEY (`b`),
-  UNIQUE KEY `a` (`a`)
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (b) (PARTITION x1 VALUES
LESS THAN (5) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (10) ENGINE =
ndbcluster, PARTITION x3 VALUES LESS THAN (20) ENGINE = ndbcluster)
-drop table t1;
-CREATE TABLE t1
-(id MEDIUMINT NOT NULL,
-b1 BIT(8),
-vc VARCHAR(255),
-bc CHAR(255),
-d DECIMAL(10,4) DEFAULT 0,
-f FLOAT DEFAULT 0,
-total BIGINT UNSIGNED,
-y YEAR,
-t DATE) ENGINE=NDB
-PARTITION BY RANGE (YEAR(t))
-(PARTITION p0 VALUES LESS THAN (1901),
-PARTITION p1 VALUES LESS THAN (1946),
-PARTITION p2 VALUES LESS THAN (1966),
-PARTITION p3 VALUES LESS THAN (1986),
-PARTITION p4 VALUES LESS THAN (2005),
-PARTITION p5 VALUES LESS THAN MAXVALUE);
-INSERT INTO t1 VALUES (0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-SELECT * FROM t1;
-id	b1	vc	bc	d	f	total	y	t
-0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-ALTER TABLE t1 ENGINE=MYISAM;
-SELECT * FROM t1;
-id	b1	vc	bc	d	f	total	y	t
-0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-DROP TABLE t1;
-CREATE LOGFILE GROUP lg1
-ADD UNDOFILE 'undofile.dat'
-  INITIAL_SIZE 16M
-UNDO_BUFFER_SIZE=1M
-ENGINE=NDB;
-CREATE TABLESPACE ts1
-ADD DATAFILE 'datafile.dat'
-  USE LOGFILE GROUP lg1
-INITIAL_SIZE 12M
-ENGINE NDB;
-CREATE TABLE test.t1 (
-a1 INT,
-a2 TEXT NOT NULL,
-a3 BIT NOT NULL,
-a4 DECIMAL(8,3),
-a5 INT NOT NULL,
-a6 INT,
-PRIMARY KEY(a1))
-TABLESPACE ts1 STORAGE DISK ENGINE=NDB
-PARTITION BY LIST (a1)
-(PARTITION p0 VALUES IN (1,2,3,4,5),
-PARTITION p1 VALUES IN (6,7,8,9, 10),
-PARTITION p2 VALUES IN (11, 12, 13, 14, 15));
-ALTER TABLE test.t1 DROP COLUMN a6;
-ALTER TABLE test.t1 ADD COLUMN a6 VARCHAR(255);
-SELECT COUNT(*) FROM test.t1;
-COUNT(*)
-15
-ALTER TABLE test.t1 DROP COLUMN a4;
-SELECT COUNT(*) FROM test.t1;
-COUNT(*)
-15
-DROP TABLE t1;
-CREATE TABLE test.t1 (
-a1 INT,
-a2 TEXT NOT NULL,
-a3 BIT NOT NULL,
-a4 DECIMAL(8,3),
-a5 INT NOT NULL,
-a6 VARCHAR(255),
-PRIMARY KEY(a1))
-TABLESPACE ts1 STORAGE DISK ENGINE=NDB
-PARTITION BY HASH(a1)
-PARTITIONS 4;
-SELECT COUNT(*) FROM test.t1;
-COUNT(*)
-15
-ALTER TABLE test.t1 DROP COLUMN a4;
-SELECT COUNT(*) FROM test.t1;
-COUNT(*)
-15
-DROP TABLE t1;
-ALTER TABLESPACE ts1 
-DROP DATAFILE 'datafile.dat' 
-ENGINE=NDB;
-DROP TABLESPACE ts1 ENGINE=NDB;
-DROP LOGFILE GROUP lg1 ENGINE=NDB;
-CREATE TABLE t1
-(id MEDIUMINT NOT NULL,
-b1 BIT(8),
-vc VARCHAR(255),
-bc CHAR(255),
-d DECIMAL(10,4) DEFAULT 0,
-f FLOAT DEFAULT 0,
-total BIGINT UNSIGNED,
-y YEAR,
-t DATE) ENGINE=NDB
-PARTITION BY LIST(id)
-(PARTITION p0 VALUES IN (2, 4),
-PARTITION p1 VALUES IN (42, 142));
-INSERT INTO t1 VALUES (2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-SELECT * FROM t1;
-id	b1	vc	bc	d	f	total	y	t
-2	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-ALTER TABLE t1 ADD PARTITION
-(PARTITION p2 VALUES IN (412));
-SELECT * FROM t1;
-id	b1	vc	bc	d	f	total	y	t
-2	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-DROP TABLE t1;
-CREATE TABLE t1 (
-a int not null,
-b int not null,
-c int not null)
-partition by list(a)
-partitions 2
-(partition x123 values in (1,5,6),
-partition x234 values in (4,7,8));
-INSERT into t1 VALUES (5,1,1);
-select * from t1;
-a	b	c
-5	1	1
-UPDATE t1 SET a=8 WHERE a=5 AND b=1;
-select * from t1;
-a	b	c
-8	1	1
-drop table t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) engine=ndb
-PARTITION BY RANGE(f1)
-( PARTITION part1 VALUES LESS THAN (2),
-PARTITION part2 VALUES LESS THAN (1000));
-INSERT INTO t1 VALUES(1, '---1---');
-INSERT INTO t1 VALUES(2, '---2---');
-select * from t1 order by f1;
-f1	f2
-1	---1---
-2	---2---
-UPDATE t1 SET f1 = f1 + 4 WHERE f1 = 2;
-select * from t1 order by f1;
-f1	f2
-1	---1---
-6	---2---
-UPDATE t1 SET f1 = f1 + 4 WHERE f1 = 1;
-select * from t1 order by f1;
-f1	f2
-5	---1---
-6	---2---
-drop table t1;

=== modified file 'mysql-test/suite/parts/r/part_supported_sql_func_ndb.result'
--- a/mysql-test/suite/parts/r/part_supported_sql_func_ndb.result	2007-04-30 14:24:13
+0000
+++ b/mysql-test/suite/parts/r/part_supported_sql_func_ndb.result	2008-07-01 18:38:15
+0000
@@ -31,14 +31,12 @@ subpartition by hash(abs(col1)) subparti
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 int) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(abs(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 int) engine='NDB' 
 partition by range(colint) 
@@ -55,9 +53,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 '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table
t6;
 select abs(col1) from t1 order by col1;
 abs(col1)
 5
@@ -414,14 +412,12 @@ subpartition by hash(abs(col1)) subparti
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(abs(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -585,37 +581,18 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-13
-15
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-13
-15
 alter table t55
-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),
-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)
+partition by list(colint) 
+subpartition by hash(abs(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` int(11) DEFAULT NULL
-) ENGINE=NDB 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 =
NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (abs(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	15
@@ -663,13 +640,29 @@ colint	col1
 50	56
 51	34
 55	123
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
+-------------------------------------------------------------------------
+---  Delete rows and partitions of tables with abs(col1)
+-------------------------------------------------------------------------
+delete from t1 where col1=13 ;
+delete from t2 where col1=13 ;
+delete from t3 where col1=13 ;
+delete from t4 where col1=13 ;
+delete from t5 where col1=13 ;
+delete from t6 where col1=13 ;
+select * from t1 order by col1;
+col1
+15
+select * from t2 order by col1;
+col1
+15
+17
+select * from t3 order by col1;
+col1
+15
+17
+select * from t4 order by colint;
 colint	col1
 1	15
-2	13
 3	15
 4	17
 5	23
@@ -713,14 +706,9 @@ colint	col1
 50	56
 51	34
 55	123
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (abs(15)),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+select * from t5 order by colint;
 colint	col1
 1	15
-2	13
 3	15
 4	17
 5	23
@@ -764,13 +752,29 @@ colint	col1
 50	56
 51	34
 55	123
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
+insert into t1 values (13 );
+insert into t2 values (13 );
+insert into t3 values (13 );
+insert into t4 values (60,13 );
+insert into t5 values (60,13 );
+insert into t6 values (60,13 );
+select * from t1 order by col1;
+col1
+13
+15
+select * from t2 order by col1;
+col1
+13
+15
+17
+select * from t3 order by col1;
+col1
+13
+15
+17
+select * from t4 order by colint;
 colint	col1
 1	15
-2	13
 3	15
 4	17
 5	23
@@ -814,14 +818,57 @@ colint	col1
 50	56
 51	34
 55	123
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (abs(15)),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+60	13
+select * from t5 order by colint;
+colint	col1
+1	15
+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	15
+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
+60	13
+select * from t6 order by colint;
 colint	col1
 1	15
-2	13
 3	15
 4	17
 5	23
@@ -865,27 +912,28 @@ colint	col1
 50	56
 51	34
 55	123
+60	13
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with abs(col1)
 -------------------------------------------------------------------------
-delete from t1 where col1=13 ;
-delete from t2 where col1=13 ;
-delete from t3 where col1=13 ;
-delete from t4 where col1=13 ;
-delete from t5 where col1=13 ;
-delete from t6 where col1=13 ;
-select * from t1 order by col1;
+delete from t11 where col1=13 ;
+delete from t22 where col1=13 ;
+delete from t33 where col1=13 ;
+delete from t44 where col1=13 ;
+delete from t55 where col1=13 ;
+delete from t66 where col1=13 ;
+select * from t11 order by col1;
 col1
 15
-select * from t2 order by col1;
+select * from t22 order by col1;
 col1
 15
 17
-select * from t3 order by col1;
+select * from t33 order by col1;
 col1
 15
 17
-select * from t4 order by colint;
+select * from t44 order by colint;
 colint	col1
 1	15
 3	15
@@ -931,7 +979,7 @@ colint	col1
 50	56
 51	34
 55	123
-select * from t5 order by colint;
+select * from t55 order by colint;
 colint	col1
 1	15
 3	15
@@ -977,27 +1025,27 @@ colint	col1
 50	56
 51	34
 55	123
-insert into t1 values (13 );
-insert into t2 values (13 );
-insert into t3 values (13 );
-insert into t4 values (60,13 );
-insert into t5 values (60,13 );
-insert into t6 values (60,13 );
-select * from t1 order by col1;
+insert into t11 values (13 );
+insert into t22 values (13 );
+insert into t33 values (13 );
+insert into t44 values (60,13 );
+insert into t55 values (60,13 );
+insert into t66 values (60,13 );
+select * from t11 order by col1;
 col1
 13
 15
-select * from t2 order by col1;
+select * from t22 order by col1;
 col1
 13
 15
 17
-select * from t3 order by col1;
+select * from t33 order by col1;
 col1
 13
 15
 17
-select * from t4 order by colint;
+select * from t44 order by colint;
 colint	col1
 1	15
 3	15
@@ -1044,7 +1092,7 @@ colint	col1
 51	34
 55	123
 60	13
-select * from t5 order by colint;
+select * from t55 order by colint;
 colint	col1
 1	15
 3	15
@@ -1091,7 +1139,7 @@ colint	col1
 51	34
 55	123
 60	13
-select * from t6 order by colint;
+select * from t66 order by colint;
 colint	col1
 1	15
 3	15
@@ -1138,26 +1186,113 @@ colint	col1
 51	34
 55	123
 60	13
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
+-------------------------
+---- some alter table end
+-------------------------
+drop table if exists t1 ;
+drop table if exists t2 ;
+drop table if exists t3 ;
+drop table if exists t4 ;
+drop table if exists t5 ;
+drop table if exists t6 ;
+drop table if exists t11 ;
+drop table if exists t22 ;
+drop table if exists t33 ;
+drop table if exists t44 ;
+drop table if exists t55 ;
+drop table if exists t66 ;
+-------------------------------------------------------------------------
+---  mod(col1,10)  in partition with coltype  int
+-------------------------------------------------------------------------
+drop table if exists t1 ;
+drop table if exists t2 ;
+drop table if exists t3 ;
+drop table if exists t4 ;
+drop table if exists t5 ;
+drop table if exists t6 ;
+-------------------------------------------------------------------------
+---  Create tables with mod(col1,10)
+-------------------------------------------------------------------------
+create table t1 (col1 int) engine='NDB' 
+partition by range(mod(col1,10)) 
+(partition p0 values less than (15),
+partition p1 values less than maxvalue);
+create table t2 (col1 int) engine='NDB' 
+partition by list(mod(col1,10)) 
+(partition p0 values in (0,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)
+);
+create table t3 (col1 int) engine='NDB' 
+partition by hash(mod(col1,10));
+create table t4 (colint int, col1 int) engine='NDB' 
+partition by range(colint) 
+subpartition by hash(mod(col1,10)) subpartitions 2 
+(partition p0 values less than (15),
+partition p1 values less than maxvalue);
+create table t5 (colint int, col1 int) engine='NDB' 
+partition by list(colint) 
+subpartition by hash(mod(col1,10)) subpartitions 2 
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+create table t6 (colint int, col1 int) engine='NDB' 
+partition by range(colint) 
+(partition p0 values less than (mod(15,10)),
+partition p1 values less than maxvalue);
+-------------------------------------------------------------------------
+---  Access tables with mod(col1,10) 
+-------------------------------------------------------------------------
+insert into t1 values (5);
+insert into t1 values (19);
+insert into t2 values (5);
+insert into t2 values (19);
+insert into t2 values (17);
+insert into t3 values (5);
+insert into t3 values (19);
+insert into t3 values (17);
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_int.inc' into table
t6;
+select mod(col1,10) from t1 order by col1;
+mod(col1,10)
+5
+9
 select * from t1 order by col1;
 col1
-15
+5
+19
 select * from t2 order by col1;
 col1
-13
-15
+5
 17
+19
 select * from t3 order by col1;
 col1
-13
-15
+5
 17
+19
 select * from t4 order by colint;
 colint	col1
+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
@@ -1173,7 +1308,7 @@ colint	col1
 27	3
 28	2
 29	3
-30	15
+30	5
 31	6
 32	8
 33	9
@@ -1189,9 +1324,18 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
 select * from t5 order by colint;
 colint	col1
+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
@@ -1211,7 +1355,7 @@ colint	col1
 27	3
 28	2
 29	3
-30	15
+30	5
 31	6
 32	8
 33	9
@@ -1227,9 +1371,22 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
 select * from t6 order by colint;
 colint	col1
+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
@@ -1245,7 +1402,7 @@ colint	col1
 27	3
 28	2
 29	3
-30	15
+30	5
 31	6
 32	8
 33	9
@@ -1261,30 +1418,30 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with abs(col1)
--------------------------------------------------------------------------
-delete from t11 where col1=13 ;
-delete from t22 where col1=13 ;
-delete from t33 where col1=13 ;
-delete from t44 where col1=13 ;
-delete from t55 where col1=13 ;
-delete from t66 where col1=13 ;
-select * from t11 order by col1;
+update t1 set col1=15  where col1=5;
+update t2 set col1=15  where col1=5;
+update t3 set col1=15  where col1=5;
+update t4 set col1=15  where col1=5;
+update t5 set col1=15  where col1=5;
+update t6 set col1=15  where col1=5;
+select * from t1 order by col1;
 col1
 15
-select * from t22 order by col1;
+19
+select * from t2 order by col1;
 col1
 15
 17
-select * from t33 order by col1;
+19
+select * from t3 order by col1;
 col1
 15
 17
-select * from t44 order by colint;
+19
+select * from t4 order by colint;
 colint	col1
 1	15
+2	13
 3	15
 4	17
 5	23
@@ -1328,9 +1485,10 @@ colint	col1
 50	56
 51	34
 55	123
-select * from t55 order by colint;
+select * from t5 order by colint;
 colint	col1
 1	15
+2	13
 3	15
 4	17
 5	23
@@ -1374,29 +1532,118 @@ colint	col1
 50	56
 51	34
 55	123
-insert into t11 values (13 );
-insert into t22 values (13 );
-insert into t33 values (13 );
-insert into t44 values (60,13 );
-insert into t55 values (60,13 );
-insert into t66 values (60,13 );
+select * from t6 order by colint;
+colint	col1
+1	15
+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	15
+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
+-------------------------------------------------------------------------
+---  Alter tables with mod(col1,10)
+-------------------------------------------------------------------------
+drop table if exists t11 ;
+drop table if exists t22 ;
+drop table if exists t33 ;
+drop table if exists t44 ;
+drop table if exists t55 ;
+drop table if exists t66 ;
+create table t11 engine='NDB' as select * from t1;
+create table t22 engine='NDB' as select * from t2;
+create table t33 engine='NDB' as select * from t3;
+create table t44 engine='NDB' as select * from t4;
+create table t55 engine='NDB' as select * from t5;
+create table t66 engine='NDB' as select * from t6;
+alter table t11
+partition by range(mod(col1,10)) 
+(partition p0 values less than (15),
+partition p1 values less than maxvalue);
+alter table t22
+partition by list(mod(col1,10)) 
+(partition p0 values in (0,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)
+);
+alter table t33
+partition by hash(mod(col1,10));
+alter table t44
+partition by range(colint) 
+subpartition by hash(mod(col1,10)) subpartitions 2 
+(partition p0 values less than (15),
+partition p1 values less than maxvalue);
+alter table t55
+partition by list(colint) 
+subpartition by hash(mod(col1,10)) subpartitions 2 
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+alter table t66
+partition by range(colint) 
+(partition p0 values less than (mod(15,10)),
+partition p1 values less than maxvalue);
 select * from t11 order by col1;
 col1
-13
 15
+19
 select * from t22 order by col1;
 col1
-13
 15
 17
+19
 select * from t33 order by col1;
 col1
-13
 15
 17
+19
 select * from t44 order by colint;
 colint	col1
 1	15
+2	13
 3	15
 4	17
 5	23
@@ -1440,10 +1687,10 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
 select * from t55 order by colint;
 colint	col1
 1	15
+2	13
 3	15
 4	17
 5	23
@@ -1487,10 +1734,10 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
 select * from t66 order by colint;
 colint	col1
 1	15
+2	13
 3	15
 4	17
 5	23
@@ -1534,27 +1781,37 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-15
-select * from t22 order by col1;
-col1
-13
-15
-17
-select * from t33 order by col1;
-col1
-13
-15
-17
-select * from t44 order by colint;
+---------------------------
+---- some alter table begin
+---------------------------
+alter table t55
+partition by list(colint) 
+subpartition by hash(mod(col1,10)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+show create table t55;
+Table	Create Table
+t55	CREATE TABLE `t55` (
+  `colint` int(11) DEFAULT NULL,
+  `col1` int(11) DEFAULT NULL
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (mod(col1,10)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
+select * from t55 order by colint;
 colint	col1
+1	15
+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
@@ -1586,9 +1843,38 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
-select * from t55 order by colint;
+-------------------------------------------------------------------------
+---  Delete rows and partitions of tables with mod(col1,10)
+-------------------------------------------------------------------------
+delete from t1 where col1=19;
+delete from t2 where col1=19;
+delete from t3 where col1=19;
+delete from t4 where col1=19;
+delete from t5 where col1=19;
+delete from t6 where col1=19;
+select * from t1 order by col1;
+col1
+15
+select * from t2 order by col1;
+col1
+15
+17
+select * from t3 order by col1;
+col1
+15
+17
+select * from t4 order by colint;
 colint	col1
+1	15
+2	13
+3	15
+4	17
+5	23
+6	34
+7	56
+8	56
+9	45
+10	34
 11	78
 12	89
 13	67
@@ -1624,9 +1910,22 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
-select * from t66 order by colint;
+select * from t5 order by colint;
 colint	col1
+1	15
+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
@@ -1658,2501 +1957,448 @@ colint	col1
 50	56
 51	34
 55	123
-60	13
--------------------------
----- some alter table end
--------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
--------------------------------------------------------------------------
----  ascii(col1)  in partition with coltype  char(1)
--------------------------------------------------------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
--------------------------------------------------------------------------
----  Create tables with ascii(col1)
--------------------------------------------------------------------------
-create table t1 (col1 char(1)) engine='NDB' 
-partition by range(ascii(col1)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t2 (col1 char(1)) engine='NDB' 
-partition by list(ascii(col1)) 
-(partition p0 values in (0,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)
-);
-create table t3 (col1 char(1)) engine='NDB' 
-partition by hash(ascii(col1));
-create table t4 (colint int, col1 char(1)) engine='NDB' 
-partition by range(colint) 
-subpartition by hash(ascii(col1)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t5 (colint int, col1 char(1)) engine='NDB' 
-partition by list(colint)
-subpartition by hash(ascii(col1)) subpartitions 2 
-(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)
-);
-create table t6 (colint int, col1 char(1)) engine='NDB' 
-partition by range(colint) 
-(partition p0 values less than (ascii('5')),
-partition p1 values less than maxvalue);
--------------------------------------------------------------------------
----  Access tables with ascii(col1) 
--------------------------------------------------------------------------
-insert into t1 values ('1');
-insert into t1 values ('9');
-insert into t2 values ('1');
-insert into t2 values ('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;
-select ascii(col1) from t1 order by col1;
-ascii(col1)
-49
-57
-select * from t1 order by col1;
-col1
-1
-9
-select * from t2 order by col1;
-col1
-1
-3
-9
-select * from t3 order by col1;
-col1
-1
-3
-9
-select * from t4 order by colint;
-colint	col1
-1	1
-2	9
-3	3
-4	8
-select * from t5 order by colint;
-colint	col1
-1	1
-2	9
-3	3
-4	8
-select * from t6 order by colint;
-colint	col1
-1	1
-2	9
-3	3
-4	8
-update t1 set col1='8' where col1='1';
-update t2 set col1='8' where col1='1';
-update t3 set col1='8' where col1='1';
-update t4 set col1='8' where col1='1';
-update t5 set col1='8' where col1='1';
-update t6 set col1='8' where col1='1';
-select * from t1 order by col1;
-col1
-8
-9
-select * from t2 order by col1;
-col1
-3
-8
-9
-select * from t3 order by col1;
-col1
-3
-8
-9
-select * from t4 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-select * from t5 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-select * from t6 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
--------------------------------------------------------------------------
----  Alter tables with ascii(col1)
--------------------------------------------------------------------------
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
-create table t11 engine='NDB' as select * from t1;
-create table t22 engine='NDB' as select * from t2;
-create table t33 engine='NDB' as select * from t3;
-create table t44 engine='NDB' as select * from t4;
-create table t55 engine='NDB' as select * from t5;
-create table t66 engine='NDB' as select * from t6;
-alter table t11
-partition by range(ascii(col1)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t22
-partition by list(ascii(col1)) 
-(partition p0 values in (0,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)
-);
-alter table t33
-partition by hash(ascii(col1));
-alter table t44
-partition by range(colint) 
-subpartition by hash(ascii(col1)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t55
-partition by list(colint)
-subpartition by hash(ascii(col1)) subpartitions 2 
-(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)
-);
-alter table t66
-partition by range(colint) 
-(partition p0 values less than (ascii('5')),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-8
-9
-select * from t22 order by col1;
-col1
-3
-8
-9
-select * from t33 order by col1;
-col1
-3
-8
-9
-select * from t44 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-select * from t55 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-8
-9
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-8
-9
-alter table t55
-partition by list(colint)
-subpartition by hash(ascii(col1)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` char(1) DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (ascii(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE
= NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (ascii('5')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (ascii('5')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with ascii(col1)
--------------------------------------------------------------------------
-delete from t1 where col1='9';
-delete from t2 where col1='9';
-delete from t3 where col1='9';
-delete from t4 where col1='9';
-delete from t5 where col1='9';
-delete from t6 where col1='9';
-select * from t1 order by col1;
-col1
-8
-select * from t2 order by col1;
-col1
-3
-8
-select * from t3 order by col1;
-col1
-3
-8
-select * from t4 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-select * from t5 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-insert into t1 values ('9');
-insert into t2 values ('9');
-insert into t3 values ('9');
-insert into t4 values (60,'9');
-insert into t5 values (60,'9');
-insert into t6 values (60,'9');
-select * from t1 order by col1;
-col1
-8
-9
-select * from t2 order by col1;
-col1
-3
-8
-9
-select * from t3 order by col1;
-col1
-3
-8
-9
-select * from t4 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-select * from t5 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-select * from t6 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-8
-9
-select * from t2 order by col1;
-col1
-3
-8
-9
-select * from t3 order by col1;
-col1
-3
-8
-9
-select * from t4 order by colint;
-colint	col1
-60	9
-select * from t5 order by colint;
-colint	col1
-60	9
-select * from t6 order by colint;
-colint	col1
-60	9
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with ascii(col1)
--------------------------------------------------------------------------
-delete from t11 where col1='9';
-delete from t22 where col1='9';
-delete from t33 where col1='9';
-delete from t44 where col1='9';
-delete from t55 where col1='9';
-delete from t66 where col1='9';
-select * from t11 order by col1;
-col1
-8
-select * from t22 order by col1;
-col1
-3
-8
-select * from t33 order by col1;
-col1
-3
-8
-select * from t44 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-select * from t55 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-insert into t11 values ('9');
-insert into t22 values ('9');
-insert into t33 values ('9');
-insert into t44 values (60,'9');
-insert into t55 values (60,'9');
-insert into t66 values (60,'9');
-select * from t11 order by col1;
-col1
-8
-9
-select * from t22 order by col1;
-col1
-3
-8
-9
-select * from t33 order by col1;
-col1
-3
-8
-9
-select * from t44 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-select * from t55 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-select * from t66 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-8
-9
-select * from t22 order by col1;
-col1
-3
-8
-9
-select * from t33 order by col1;
-col1
-3
-8
-9
-select * from t44 order by colint;
-colint	col1
-60	9
-select * from t55 order by colint;
-colint	col1
-60	9
-select * from t66 order by colint;
-colint	col1
-60	9
--------------------------
----- some alter table end
--------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
--------------------------------------------------------------------------
----  cast(ceiling(col1) as signed integer)  in partition with coltype  float(7,4)
--------------------------------------------------------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
--------------------------------------------------------------------------
----  Create tables with cast(ceiling(col1) as signed integer)
--------------------------------------------------------------------------
-create table t1 (col1 float(7,4)) engine='NDB' 
-partition by range(cast(ceiling(col1) as signed integer)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t2 (col1 float(7,4)) engine='NDB' 
-partition by list(cast(ceiling(col1) as signed integer)) 
-(partition p0 values in (0,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)
-);
-create table t3 (col1 float(7,4)) engine='NDB' 
-partition by hash(cast(ceiling(col1) as signed integer));
-create table t4 (colint int, col1 float(7,4)) engine='NDB' 
-partition by range(colint) 
-subpartition by hash(cast(ceiling(col1) as signed integer)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t5 (colint int, col1 float(7,4)) engine='NDB' 
-partition by list(colint)
-subpartition by hash(cast(ceiling(col1) as signed integer)) subpartitions 2 
-(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)
-);
-create table t6 (colint int, col1 float(7,4)) engine='NDB' 
-partition by range(colint) 
-(partition p0 values less than (cast(ceiling(15) as signed integer)),
-partition p1 values less than maxvalue);
--------------------------------------------------------------------------
----  Access tables with cast(ceiling(col1) as signed integer) 
--------------------------------------------------------------------------
-insert into t1 values (5.1230);
-insert into t1 values (13.345);
-insert into t2 values (5.1230);
-insert into t2 values (13.345);
-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;
-select cast(ceiling(col1) as signed integer) from t1 order by col1;
-cast(ceiling(col1) as signed integer)
-6
-14
-select * from t1 order by col1;
-col1
-5.1230
-13.3450
-select * from t2 order by col1;
-col1
-5.1230
-13.3450
-17.9870
-select * from t3 order by col1;
-col1
-5.1230
-13.3450
-17.9870
-select * from t4 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t6 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-update t1 set col1=15.654  where col1=5.1230;
-update t2 set col1=15.654  where col1=5.1230;
-update t3 set col1=15.654  where col1=5.1230;
-update t4 set col1=15.654  where col1=5.1230;
-update t5 set col1=15.654  where col1=5.1230;
-update t6 set col1=15.654  where col1=5.1230;
-select * from t1 order by col1;
-col1
-13.3450
-15.6540
-select * from t2 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t3 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t4 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t6 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
--------------------------------------------------------------------------
----  Alter tables with cast(ceiling(col1) as signed integer)
--------------------------------------------------------------------------
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
-create table t11 engine='NDB' as select * from t1;
-create table t22 engine='NDB' as select * from t2;
-create table t33 engine='NDB' as select * from t3;
-create table t44 engine='NDB' as select * from t4;
-create table t55 engine='NDB' as select * from t5;
-create table t66 engine='NDB' as select * from t6;
-alter table t11
-partition by range(cast(ceiling(col1) as signed integer)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t22
-partition by list(cast(ceiling(col1) as signed integer)) 
-(partition p0 values in (0,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)
-);
-alter table t33
-partition by hash(cast(ceiling(col1) as signed integer));
-alter table t44
-partition by range(colint) 
-subpartition by hash(cast(ceiling(col1) as signed integer)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t55
-partition by list(colint)
-subpartition by hash(cast(ceiling(col1) as signed integer)) subpartitions 2 
-(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)
-);
-alter table t66
-partition by range(colint) 
-(partition p0 values less than (cast(ceiling(15) as signed integer)),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-13.3450
-15.6540
-select * from t22 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t33 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t44 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t55 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-13.3450
-15.6540
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-13.3450
-15.6540
-alter table t55
-partition by list(colint)
-subpartition by hash(cast(ceiling(col1) as signed integer)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` float(7,4) DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (cast(ceiling(col1) as signed integer)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN
(1,2,3,4,5,6,7,8,9,10) ENGINE = NDB, PARTITION p1 VALUES IN
(11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2 VALUES IN
(21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (cast(ceiling(15) as signed integer)),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (cast(ceiling(15) as signed integer)),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with cast(ceiling(col1) as signed integer)
--------------------------------------------------------------------------
-delete from t1 where col1=13.345;
-delete from t2 where col1=13.345;
-delete from t3 where col1=13.345;
-delete from t4 where col1=13.345;
-delete from t5 where col1=13.345;
-delete from t6 where col1=13.345;
-select * from t1 order by col1;
-col1
-15.6540
-select * from t2 order by col1;
-col1
-15.6540
-17.9870
-select * from t3 order by col1;
-col1
-15.6540
-17.9870
-select * from t4 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-insert into t1 values (13.345);
-insert into t2 values (13.345);
-insert into t3 values (13.345);
-insert into t4 values (60,13.345);
-insert into t5 values (60,13.345);
-insert into t6 values (60,13.345);
-select * from t1 order by col1;
-col1
-13.3450
-15.6540
-select * from t2 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t3 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t4 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-select * from t5 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-select * from t6 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-15.6540
-select * from t2 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t3 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t4 order by colint;
-colint	col1
-60	13.3450
-select * from t5 order by colint;
-colint	col1
-60	13.3450
-select * from t6 order by colint;
-colint	col1
-60	13.3450
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with cast(ceiling(col1) as signed integer)
--------------------------------------------------------------------------
-delete from t11 where col1=13.345;
-delete from t22 where col1=13.345;
-delete from t33 where col1=13.345;
-delete from t44 where col1=13.345;
-delete from t55 where col1=13.345;
-delete from t66 where col1=13.345;
-select * from t11 order by col1;
-col1
-15.6540
-select * from t22 order by col1;
-col1
-15.6540
-17.9870
-select * from t33 order by col1;
-col1
-15.6540
-17.9870
-select * from t44 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-select * from t55 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-insert into t11 values (13.345);
-insert into t22 values (13.345);
-insert into t33 values (13.345);
-insert into t44 values (60,13.345);
-insert into t55 values (60,13.345);
-insert into t66 values (60,13.345);
-select * from t11 order by col1;
-col1
-13.3450
-15.6540
-select * from t22 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t33 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t44 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-select * from t55 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-15.6540
-select * from t22 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t33 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t44 order by colint;
-colint	col1
-60	13.3450
-select * from t55 order by colint;
-colint	col1
-60	13.3450
-select * from t66 order by colint;
-colint	col1
-60	13.3450
--------------------------
----- some alter table end
--------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
--------------------------------------------------------------------------
----  cast(floor(col1) as signed)  in partition with coltype  float(7,4)
--------------------------------------------------------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
--------------------------------------------------------------------------
----  Create tables with cast(floor(col1) as signed)
--------------------------------------------------------------------------
-create table t1 (col1 float(7,4)) engine='NDB' 
-partition by range(cast(floor(col1) as signed)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t2 (col1 float(7,4)) engine='NDB' 
-partition by list(cast(floor(col1) as signed)) 
-(partition p0 values in (0,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)
-);
-create table t3 (col1 float(7,4)) engine='NDB' 
-partition by hash(cast(floor(col1) as signed));
-create table t4 (colint int, col1 float(7,4)) engine='NDB' 
-partition by range(colint) 
-subpartition by hash(cast(floor(col1) as signed)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t5 (colint int, col1 float(7,4)) engine='NDB' 
-partition by list(colint)
-subpartition by hash(cast(floor(col1) as signed)) subpartitions 2 
-(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)
-);
-create table t6 (colint int, col1 float(7,4)) engine='NDB' 
-partition by range(colint) 
-(partition p0 values less than (cast(floor(15.123) as signed)),
-partition p1 values less than maxvalue);
--------------------------------------------------------------------------
----  Access tables with cast(floor(col1) as signed) 
--------------------------------------------------------------------------
-insert into t1 values (5.1230);
-insert into t1 values (13.345);
-insert into t2 values (5.1230);
-insert into t2 values (13.345);
-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;
-select cast(floor(col1) as signed) from t1 order by col1;
-cast(floor(col1) as signed)
-5
-13
-select * from t1 order by col1;
-col1
-5.1230
-13.3450
-select * from t2 order by col1;
-col1
-5.1230
-13.3450
-17.9870
-select * from t3 order by col1;
-col1
-5.1230
-13.3450
-17.9870
-select * from t4 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t6 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-update t1 set col1=15.654  where col1=5.1230;
-update t2 set col1=15.654  where col1=5.1230;
-update t3 set col1=15.654  where col1=5.1230;
-update t4 set col1=15.654  where col1=5.1230;
-update t5 set col1=15.654  where col1=5.1230;
-update t6 set col1=15.654  where col1=5.1230;
-select * from t1 order by col1;
-col1
-13.3450
-15.6540
-select * from t2 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t3 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t4 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t6 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
--------------------------------------------------------------------------
----  Alter tables with cast(floor(col1) as signed)
--------------------------------------------------------------------------
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
-create table t11 engine='NDB' as select * from t1;
-create table t22 engine='NDB' as select * from t2;
-create table t33 engine='NDB' as select * from t3;
-create table t44 engine='NDB' as select * from t4;
-create table t55 engine='NDB' as select * from t5;
-create table t66 engine='NDB' as select * from t6;
-alter table t11
-partition by range(cast(floor(col1) as signed)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t22
-partition by list(cast(floor(col1) as signed)) 
-(partition p0 values in (0,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)
-);
-alter table t33
-partition by hash(cast(floor(col1) as signed));
-alter table t44
-partition by range(colint) 
-subpartition by hash(cast(floor(col1) as signed)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t55
-partition by list(colint)
-subpartition by hash(cast(floor(col1) as signed)) subpartitions 2 
-(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)
-);
-alter table t66
-partition by range(colint) 
-(partition p0 values less than (cast(floor(15.123) as signed)),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-13.3450
-15.6540
-select * from t22 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t33 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t44 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t55 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-13.3450
-15.6540
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-13.3450
-15.6540
-alter table t55
-partition by list(colint)
-subpartition by hash(cast(floor(col1) as signed)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` float(7,4) DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (cast(floor(col1) as signed)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN
(1,2,3,4,5,6,7,8,9,10) ENGINE = NDB, PARTITION p1 VALUES IN
(11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2 VALUES IN
(21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (cast(floor(15.123) as signed)),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (cast(floor(15.123) as signed)),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-2	13.3450
-3	17.9870
-4	15.6540
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with cast(floor(col1) as signed)
--------------------------------------------------------------------------
-delete from t1 where col1=13.345;
-delete from t2 where col1=13.345;
-delete from t3 where col1=13.345;
-delete from t4 where col1=13.345;
-delete from t5 where col1=13.345;
-delete from t6 where col1=13.345;
-select * from t1 order by col1;
-col1
-15.6540
-select * from t2 order by col1;
-col1
-15.6540
-17.9870
-select * from t3 order by col1;
-col1
-15.6540
-17.9870
-select * from t4 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-insert into t1 values (13.345);
-insert into t2 values (13.345);
-insert into t3 values (13.345);
-insert into t4 values (60,13.345);
-insert into t5 values (60,13.345);
-insert into t6 values (60,13.345);
-select * from t1 order by col1;
-col1
-13.3450
-15.6540
-select * from t2 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t3 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t4 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-select * from t5 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-select * from t6 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-15.6540
-select * from t2 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t3 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t4 order by colint;
-colint	col1
-60	13.3450
-select * from t5 order by colint;
-colint	col1
-60	13.3450
-select * from t6 order by colint;
-colint	col1
-60	13.3450
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with cast(floor(col1) as signed)
--------------------------------------------------------------------------
-delete from t11 where col1=13.345;
-delete from t22 where col1=13.345;
-delete from t33 where col1=13.345;
-delete from t44 where col1=13.345;
-delete from t55 where col1=13.345;
-delete from t66 where col1=13.345;
-select * from t11 order by col1;
-col1
-15.6540
-select * from t22 order by col1;
-col1
-15.6540
-17.9870
-select * from t33 order by col1;
-col1
-15.6540
-17.9870
-select * from t44 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-select * from t55 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-insert into t11 values (13.345);
-insert into t22 values (13.345);
-insert into t33 values (13.345);
-insert into t44 values (60,13.345);
-insert into t55 values (60,13.345);
-insert into t66 values (60,13.345);
-select * from t11 order by col1;
-col1
-13.3450
-15.6540
-select * from t22 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t33 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t44 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-select * from t55 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-select * from t66 order by colint;
-colint	col1
-1	15.6540
-3	17.9870
-4	15.6540
-60	13.3450
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-15.6540
-select * from t22 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t33 order by col1;
-col1
-13.3450
-15.6540
-17.9870
-select * from t44 order by colint;
-colint	col1
-60	13.3450
-select * from t55 order by colint;
-colint	col1
-60	13.3450
-select * from t66 order by colint;
-colint	col1
-60	13.3450
--------------------------
----- some alter table end
--------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
--------------------------------------------------------------------------
----  cast(mod(col1,10) as signed)  in partition with coltype  float(7,4)
--------------------------------------------------------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
--------------------------------------------------------------------------
----  Create tables with cast(mod(col1,10) as signed)
--------------------------------------------------------------------------
-create table t1 (col1 float(7,4)) engine='NDB' 
-partition by range(cast(mod(col1,10) as signed)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t2 (col1 float(7,4)) engine='NDB' 
-partition by list(cast(mod(col1,10) as signed)) 
-(partition p0 values in (0,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)
-);
-create table t3 (col1 float(7,4)) engine='NDB' 
-partition by hash(cast(mod(col1,10) as signed));
-create table t4 (colint int, col1 float(7,4)) engine='NDB' 
-partition by range(colint) 
-subpartition by hash(cast(mod(col1,10) as signed)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t5 (colint int, col1 float(7,4)) engine='NDB' 
-partition by list(colint)
-subpartition by hash(cast(mod(col1,10) as signed)) subpartitions 2 
-(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)
-);
-create table t6 (colint int, col1 float(7,4)) engine='NDB' 
-partition by range(colint) 
-(partition p0 values less than (cast(mod(15,10) as signed)),
-partition p1 values less than maxvalue);
--------------------------------------------------------------------------
----  Access tables with cast(mod(col1,10) as signed) 
--------------------------------------------------------------------------
-insert into t1 values (5.0000);
-insert into t1 values (19);
-insert into t2 values (5.0000);
-insert into t2 values (19);
-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;
-select cast(mod(col1,10) as signed) from t1 order by col1;
-cast(mod(col1,10) as signed)
-5
-9
-select * from t1 order by col1;
-col1
-5.0000
-19.0000
-select * from t2 order by col1;
-col1
-5.0000
-17.0000
-19.0000
-select * from t3 order by col1;
-col1
-5.0000
-17.0000
-19.0000
-select * from t4 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t6 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-update t1 set col1=15  where col1=5.0000;
-update t2 set col1=15  where col1=5.0000;
-update t3 set col1=15  where col1=5.0000;
-update t4 set col1=15  where col1=5.0000;
-update t5 set col1=15  where col1=5.0000;
-update t6 set col1=15  where col1=5.0000;
-select * from t1 order by col1;
-col1
-15.0000
-19.0000
-select * from t2 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t3 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t4 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t6 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
--------------------------------------------------------------------------
----  Alter tables with cast(mod(col1,10) as signed)
--------------------------------------------------------------------------
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
-create table t11 engine='NDB' as select * from t1;
-create table t22 engine='NDB' as select * from t2;
-create table t33 engine='NDB' as select * from t3;
-create table t44 engine='NDB' as select * from t4;
-create table t55 engine='NDB' as select * from t5;
-create table t66 engine='NDB' as select * from t6;
-alter table t11
-partition by range(cast(mod(col1,10) as signed)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t22
-partition by list(cast(mod(col1,10) as signed)) 
-(partition p0 values in (0,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)
-);
-alter table t33
-partition by hash(cast(mod(col1,10) as signed));
-alter table t44
-partition by range(colint) 
-subpartition by hash(cast(mod(col1,10) as signed)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t55
-partition by list(colint)
-subpartition by hash(cast(mod(col1,10) as signed)) subpartitions 2 
-(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)
-);
-alter table t66
-partition by range(colint) 
-(partition p0 values less than (cast(mod(15,10) as signed)),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-15.0000
-19.0000
-select * from t22 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t33 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t44 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t55 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t66 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-15.0000
-19.0000
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-15.0000
-19.0000
-alter table t55
-partition by list(colint)
-subpartition by hash(cast(mod(col1,10) as signed)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` float(7,4) DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (cast(mod(col1,10) as signed)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN
(1,2,3,4,5,6,7,8,9,10) ENGINE = NDB, PARTITION p1 VALUES IN
(11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2 VALUES IN
(21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (cast(mod(15,10) as signed)),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (cast(mod(15,10) as signed)),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with cast(mod(col1,10) as signed)
--------------------------------------------------------------------------
-delete from t1 where col1=19;
-delete from t2 where col1=19;
-delete from t3 where col1=19;
-delete from t4 where col1=19;
-delete from t5 where col1=19;
-delete from t6 where col1=19;
-select * from t1 order by col1;
-col1
-15.0000
-select * from t2 order by col1;
-col1
-15.0000
-17.0000
-select * from t3 order by col1;
-col1
-15.0000
-17.0000
-select * from t4 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t5 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-insert into t1 values (19);
-insert into t2 values (19);
-insert into t3 values (19);
-insert into t4 values (60,19);
-insert into t5 values (60,19);
-insert into t6 values (60,19);
-select * from t1 order by col1;
-col1
-15.0000
-19.0000
-select * from t2 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t3 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t4 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-60	19.0000
-select * from t5 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-60	19.0000
-select * from t6 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-60	19.0000
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-select * from t2 order by col1;
-col1
-select * from t3 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t4 order by colint;
-colint	col1
-60	19.0000
-select * from t5 order by colint;
-colint	col1
-60	19.0000
-select * from t6 order by colint;
-colint	col1
-60	19.0000
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with cast(mod(col1,10) as signed)
--------------------------------------------------------------------------
-delete from t11 where col1=19;
-delete from t22 where col1=19;
-delete from t33 where col1=19;
-delete from t44 where col1=19;
-delete from t55 where col1=19;
-delete from t66 where col1=19;
-select * from t11 order by col1;
-col1
-15.0000
-select * from t22 order by col1;
-col1
-15.0000
-17.0000
-select * from t33 order by col1;
-col1
-15.0000
-17.0000
-select * from t44 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-select * from t55 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-insert into t11 values (19);
-insert into t22 values (19);
-insert into t33 values (19);
-insert into t44 values (60,19);
-insert into t55 values (60,19);
-insert into t66 values (60,19);
-select * from t11 order by col1;
-col1
-15.0000
-19.0000
-select * from t22 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t33 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t44 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-60	19.0000
-select * from t55 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-60	19.0000
-select * from t66 order by colint;
-colint	col1
-1	5.1230
-2	13.3450
-3	17.9870
-4	15.6540
-60	19.0000
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-select * from t22 order by col1;
-col1
-select * from t33 order by col1;
-col1
-15.0000
-17.0000
-19.0000
-select * from t44 order by colint;
-colint	col1
-60	19.0000
-select * from t55 order by colint;
-colint	col1
-60	19.0000
-select * from t66 order by colint;
-colint	col1
-60	19.0000
--------------------------
----- some alter table end
--------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
--------------------------------------------------------------------------
----  ord(col1)  in partition with coltype  char(3)
--------------------------------------------------------------------------
-drop table if exists t1 ;
-drop table if exists t2 ;
-drop table if exists t3 ;
-drop table if exists t4 ;
-drop table if exists t5 ;
-drop table if exists t6 ;
--------------------------------------------------------------------------
----  Create tables with ord(col1)
--------------------------------------------------------------------------
-create table t1 (col1 char(3)) engine='NDB' 
-partition by range(ord(col1)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t2 (col1 char(3)) engine='NDB' 
-partition by list(ord(col1)) 
-(partition p0 values in (0,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)
-);
-create table t3 (col1 char(3)) engine='NDB' 
-partition by hash(ord(col1));
-create table t4 (colint int, col1 char(3)) engine='NDB' 
-partition by range(colint) 
-subpartition by hash(ord(col1)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-create table t5 (colint int, col1 char(3)) engine='NDB' 
-partition by list(colint)
-subpartition by hash(ord(col1)) subpartitions 2 
-(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)
-);
-create table t6 (colint int, col1 char(3)) engine='NDB' 
-partition by range(colint) 
-(partition p0 values less than (ord('a')),
-partition p1 values less than maxvalue);
--------------------------------------------------------------------------
----  Access tables with ord(col1) 
--------------------------------------------------------------------------
-insert into t1 values ('1');
-insert into t1 values ('9');
-insert into t2 values ('1');
-insert into t2 values ('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;
-select ord(col1) from t1 order by col1;
-ord(col1)
-49
-57
-select * from t1 order by col1;
-col1
-1
-9
-select * from t2 order by col1;
-col1
-1
-3
-9
-select * from t3 order by col1;
-col1
-1
-3
-9
-select * from t4 order by colint;
-colint	col1
-1	1
-2	9
-3	3
-4	8
-select * from t5 order by colint;
-colint	col1
-1	1
-2	9
-3	3
-4	8
-select * from t6 order by colint;
-colint	col1
-1	1
-2	9
-3	3
-4	8
-update t1 set col1='8' where col1='1';
-update t2 set col1='8' where col1='1';
-update t3 set col1='8' where col1='1';
-update t4 set col1='8' where col1='1';
-update t5 set col1='8' where col1='1';
-update t6 set col1='8' where col1='1';
-select * from t1 order by col1;
-col1
-8
-9
-select * from t2 order by col1;
-col1
-3
-8
-9
-select * from t3 order by col1;
-col1
-3
-8
-9
-select * from t4 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-select * from t5 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-select * from t6 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
--------------------------------------------------------------------------
----  Alter tables with ord(col1)
--------------------------------------------------------------------------
-drop table if exists t11 ;
-drop table if exists t22 ;
-drop table if exists t33 ;
-drop table if exists t44 ;
-drop table if exists t55 ;
-drop table if exists t66 ;
-create table t11 engine='NDB' as select * from t1;
-create table t22 engine='NDB' as select * from t2;
-create table t33 engine='NDB' as select * from t3;
-create table t44 engine='NDB' as select * from t4;
-create table t55 engine='NDB' as select * from t5;
-create table t66 engine='NDB' as select * from t6;
-alter table t11
-partition by range(ord(col1)) 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t22
-partition by list(ord(col1)) 
-(partition p0 values in (0,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)
-);
-alter table t33
-partition by hash(ord(col1));
-alter table t44
-partition by range(colint) 
-subpartition by hash(ord(col1)) subpartitions 2 
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-alter table t55
-partition by list(colint)
-subpartition by hash(ord(col1)) subpartitions 2 
-(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)
-);
-alter table t66
-partition by range(colint) 
-(partition p0 values less than (ord('a')),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-8
-9
-select * from t22 order by col1;
-col1
-3
-8
-9
-select * from t33 order by col1;
-col1
-3
-8
-9
-select * from t44 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-select * from t55 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-8
-9
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-8
-9
-alter table t55
-partition by list(colint)
-subpartition by hash(ord(col1)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` char(3) DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (ord(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE =
NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (ord('a')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (ord('a')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	8
-2	9
-3	3
-4	8
--------------------------------------------------------------------------
----  Delete rows and partitions of tables with ord(col1)
--------------------------------------------------------------------------
-delete from t1 where col1='9';
-delete from t2 where col1='9';
-delete from t3 where col1='9';
-delete from t4 where col1='9';
-delete from t5 where col1='9';
-delete from t6 where col1='9';
-select * from t1 order by col1;
-col1
-8
-select * from t2 order by col1;
-col1
-3
-8
-select * from t3 order by col1;
-col1
-3
-8
-select * from t4 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-select * from t5 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-insert into t1 values ('9');
-insert into t2 values ('9');
-insert into t3 values ('9');
-insert into t4 values (60,'9');
-insert into t5 values (60,'9');
-insert into t6 values (60,'9');
-select * from t1 order by col1;
-col1
-8
-9
-select * from t2 order by col1;
-col1
-3
-8
-9
-select * from t3 order by col1;
-col1
-3
-8
-9
-select * from t4 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-select * from t5 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-select * from t6 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
+insert into t1 values (19);
+insert into t2 values (19);
+insert into t3 values (19);
+insert into t4 values (60,19);
+insert into t5 values (60,19);
+insert into t6 values (60,19);
 select * from t1 order by col1;
 col1
-8
-9
+15
+19
 select * from t2 order by col1;
 col1
-3
-8
-9
+15
+17
+19
 select * from t3 order by col1;
 col1
-3
-8
-9
+15
+17
+19
 select * from t4 order by colint;
 colint	col1
-60	9
+1	15
+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	15
+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
+60	19
 select * from t5 order by colint;
 colint	col1
-60	9
+1	15
+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	15
+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
+60	19
 select * from t6 order by colint;
 colint	col1
+1	15
+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	15
+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
+60	19
 -------------------------------------------------------------------------
----  Delete rows and partitions of tables with ord(col1)
+---  Delete rows and partitions of tables with mod(col1,10)
 -------------------------------------------------------------------------
-delete from t11 where col1='9';
-delete from t22 where col1='9';
-delete from t33 where col1='9';
-delete from t44 where col1='9';
-delete from t55 where col1='9';
-delete from t66 where col1='9';
+delete from t11 where col1=19;
+delete from t22 where col1=19;
+delete from t33 where col1=19;
+delete from t44 where col1=19;
+delete from t55 where col1=19;
+delete from t66 where col1=19;
 select * from t11 order by col1;
 col1
-8
+15
 select * from t22 order by col1;
 col1
-3
-8
+15
+17
 select * from t33 order by col1;
 col1
-3
-8
+15
+17
 select * from t44 order by colint;
 colint	col1
-1	8
-3	3
-4	8
+1	15
+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	15
+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
 select * from t55 order by colint;
 colint	col1
-1	8
-3	3
-4	8
-insert into t11 values ('9');
-insert into t22 values ('9');
-insert into t33 values ('9');
-insert into t44 values (60,'9');
-insert into t55 values (60,'9');
-insert into t66 values (60,'9');
-select * from t11 order by col1;
-col1
-8
-9
-select * from t22 order by col1;
-col1
-3
-8
-9
-select * from t33 order by col1;
-col1
-3
-8
-9
-select * from t44 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-select * from t55 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-select * from t66 order by colint;
-colint	col1
-1	8
-3	3
-4	8
-60	9
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
+1	15
+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	15
+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
+insert into t11 values (19);
+insert into t22 values (19);
+insert into t33 values (19);
+insert into t44 values (60,19);
+insert into t55 values (60,19);
+insert into t66 values (60,19);
 select * from t11 order by col1;
 col1
-8
-9
+15
+19
 select * from t22 order by col1;
 col1
-3
-8
-9
+15
+17
+19
 select * from t33 order by col1;
 col1
-3
-8
-9
+15
+17
+19
 select * from t44 order by colint;
 colint	col1
-60	9
+1	15
+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	15
+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
+60	19
 select * from t55 order by colint;
 colint	col1
-60	9
+1	15
+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	15
+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
+60	19
 select * from t66 order by colint;
 colint	col1
+1	15
+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	15
+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
+60	19
 -------------------------
 ---- some alter table end
 -------------------------
@@ -4201,14 +2447,12 @@ subpartition by hash(day(col1)) subparti
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(day(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
@@ -4225,9 +2469,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t6;
 select day(col1) from t1 order by col1;
 day(col1)
 17
@@ -4338,14 +2582,12 @@ subpartition by hash(day(col1)) subparti
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(day(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -4386,81 +2628,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
 alter table t55
-partition by list(colint)
-subpartition by hash(day(col1)) 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)
+partition by list(colint) 
+subpartition by hash(day(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (day(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE =
NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (day(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	2006-02-05
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-05
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (day('2006-12-21')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-05
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-05
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (day('2006-12-21')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-05
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with day(col1)
 -------------------------------------------------------------------------
@@ -4529,32 +2714,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-2006-01-17
-select * from t2 order by col1;
-col1
-2006-01-17
-2006-01-25
-select * from t3 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-05
-select * from t4 order by colint;
-colint	col1
-60	2006-01-17
-select * from t5 order by colint;
-colint	col1
-60	2006-01-17
-select * from t6 order by colint;
-colint	col1
-60	2006-01-17
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with day(col1)
 -------------------------------------------------------------------------
@@ -4623,32 +2782,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-2006-01-17
-select * from t22 order by col1;
-col1
-2006-01-17
-2006-01-25
-select * from t33 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-05
-select * from t44 order by colint;
-colint	col1
-60	2006-01-17
-select * from t55 order by colint;
-colint	col1
-60	2006-01-17
-select * from t66 order by colint;
-colint	col1
-60	2006-01-17
 -------------------------
 ---- some alter table end
 -------------------------
@@ -4697,14 +2830,12 @@ subpartition by hash(dayofmonth(col1)) s
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(dayofmonth(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
@@ -4721,9 +2852,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t6;
 select dayofmonth(col1) from t1 order by col1;
 dayofmonth(col1)
 17
@@ -4834,124 +2965,65 @@ subpartition by hash(dayofmonth(col1)) s
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
-subpartition by hash(dayofmonth(col1)) subpartitions 2 
-(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)
-);
-alter table t66
-partition by range(colint) 
-(partition p0 values less than (dayofmonth('2006-12-24')),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-select * from t22 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-05
-select * from t33 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-05
-select * from t44 order by colint;
-colint	col1
-1	2006-02-05
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-select * from t55 order by colint;
-colint	col1
-1	2006-02-05
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-select * from t66 order by colint;
-colint	col1
-1	2006-02-05
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-alter table t55
-partition by list(colint)
-subpartition by hash(dayofmonth(col1)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (dayofmonth(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10)
ENGINE = NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB,
PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES
IN (31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	2006-02-05
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
+partition by list(colint) 
+subpartition by hash(dayofmonth(col1)) subpartitions 2 
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
 alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
+partition by range(colint) 
+(partition p0 values less than (dayofmonth('2006-12-24')),
+partition p1 values less than maxvalue);
+select * from t11 order by col1;
+col1
+2006-01-17
+2006-02-05
+select * from t22 order by col1;
+col1
+2006-01-17
+2006-01-25
+2006-02-05
+select * from t33 order by col1;
+col1
+2006-01-17
+2006-01-25
+2006-02-05
+select * from t44 order by colint;
 colint	col1
 1	2006-02-05
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (dayofmonth('2006-12-24')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+select * from t55 order by colint;
 colint	col1
 1	2006-02-05
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
 select * from t66 order by colint;
 colint	col1
 1	2006-02-05
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (dayofmonth('2006-12-24')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+---------------------------
+---- some alter table begin
+---------------------------
+alter table t55
+partition by list(colint) 
+subpartition by hash(dayofmonth(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+show create table t55;
+Table	Create Table
+t55	CREATE TABLE `t55` (
+  `colint` int(11) DEFAULT NULL,
+  `col1` date DEFAULT NULL
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (dayofmonth(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
+select * from t55 order by colint;
 colint	col1
 1	2006-02-05
 2	2006-01-17
@@ -5025,32 +3097,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-2006-01-17
-select * from t2 order by col1;
-col1
-2006-01-17
-2006-01-25
-select * from t3 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-05
-select * from t4 order by colint;
-colint	col1
-60	2006-01-17
-select * from t5 order by colint;
-colint	col1
-60	2006-01-17
-select * from t6 order by colint;
-colint	col1
-60	2006-01-17
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with dayofmonth(col1)
 -------------------------------------------------------------------------
@@ -5119,32 +3165,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-2006-01-17
-select * from t22 order by col1;
-col1
-2006-01-17
-2006-01-25
-select * from t33 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-05
-select * from t44 order by colint;
-colint	col1
-60	2006-01-17
-select * from t55 order by colint;
-colint	col1
-60	2006-01-17
-select * from t66 order by colint;
-colint	col1
-60	2006-01-17
 -------------------------
 ---- some alter table end
 -------------------------
@@ -5193,14 +3213,12 @@ subpartition by hash(dayofweek(col1)) su
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(dayofweek(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
@@ -5217,9 +3235,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t6;
 select dayofweek(col1) from t1 order by col1;
 dayofweek(col1)
 3
@@ -5330,14 +3348,12 @@ subpartition by hash(dayofweek(col1)) su
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(dayofweek(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -5378,81 +3394,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-02-05
-2006-02-17
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-02-05
-2006-02-17
 alter table t55
-partition by list(colint)
-subpartition by hash(dayofweek(col1)) 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)
+partition by list(colint) 
+subpartition by hash(dayofweek(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (dayofweek(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10)
ENGINE = NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB,
PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES
IN (31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (dayofweek(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (dayofweek('2006-12-24')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (dayofweek('2006-12-24')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with dayofweek(col1)
 -------------------------------------------------------------------------
@@ -5526,33 +3485,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-02-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-select * from t2 order by col1;
-col1
-select * from t3 order by col1;
-col1
-2006-01-25
-2006-02-05
-2006-02-17
-select * from t4 order by colint;
-colint	col1
-60	2006-02-17
-select * from t5 order by colint;
-colint	col1
-60	2006-02-17
-select * from t6 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-60	2006-02-17
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with dayofweek(col1)
 -------------------------------------------------------------------------
@@ -5626,33 +3558,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-02-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-select * from t22 order by col1;
-col1
-select * from t33 order by col1;
-col1
-2006-01-25
-2006-02-05
-2006-02-17
-select * from t44 order by colint;
-colint	col1
-60	2006-02-17
-select * from t55 order by colint;
-colint	col1
-60	2006-02-17
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-60	2006-02-17
 -------------------------
 ---- some alter table end
 -------------------------
@@ -5701,14 +3606,12 @@ subpartition by hash(dayofyear(col1)) su
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(dayofyear(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
@@ -5725,9 +3628,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -5838,14 +3741,12 @@ subpartition by hash(dayofyear(col1)) su
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(dayofyear(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -5884,78 +3785,21 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 ---------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-alter table t55
-partition by list(colint)
-subpartition by hash(dayofyear(col1)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (dayofyear(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10)
ENGINE = NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB,
PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES
IN (31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (dayofyear('2006-12-25')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (dayofyear('2006-12-25')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+---- some alter table begin
+---------------------------
+alter table t55
+partition by list(colint) 
+subpartition by hash(dayofyear(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+show create table t55;
+Table	Create Table
+t55	CREATE TABLE `t55` (
+  `colint` int(11) DEFAULT NULL,
+  `col1` date DEFAULT NULL
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (dayofyear(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
+select * from t55 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
@@ -6029,33 +3873,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-2006-01-17
-2006-02-05
-select * from t2 order by col1;
-col1
-2006-01-17
-2006-02-05
-2006-02-25
-select * from t3 order by col1;
-col1
-2006-01-17
-2006-02-05
-2006-02-25
-select * from t4 order by colint;
-colint	col1
-60	2006-01-17
-select * from t5 order by colint;
-colint	col1
-60	2006-01-17
-select * from t6 order by colint;
-colint	col1
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with dayofyear(col1)
 -------------------------------------------------------------------------
@@ -6124,33 +3941,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-select * from t22 order by col1;
-col1
-2006-01-17
-2006-02-05
-2006-02-25
-select * from t33 order by col1;
-col1
-2006-01-17
-2006-02-05
-2006-02-25
-select * from t44 order by colint;
-colint	col1
-60	2006-01-17
-select * from t55 order by colint;
-colint	col1
-60	2006-01-17
-select * from t66 order by colint;
-colint	col1
 -------------------------
 ---- some alter table end
 -------------------------
@@ -6199,14 +3989,12 @@ subpartition by hash(dayofyear(col1)) su
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 char(30)) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(dayofyear(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 char(30)) engine='NDB' 
 partition by range(colint) 
@@ -6223,9 +4011,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t6;
 select dayofyear(col1) from t1 order by col1;
 dayofyear(col1)
 3
@@ -6336,14 +4124,12 @@ subpartition by hash(dayofyear(col1)) su
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(dayofyear(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -6384,81 +4170,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
 alter table t55
-partition by list(colint)
-subpartition by hash(dayofyear(col1)) 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)
+partition by list(colint) 
+subpartition by hash(dayofyear(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` char(30) DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (dayofyear(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10)
ENGINE = NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB,
PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES
IN (31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (dayofyear(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (dayofyear('2006-12-25')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (dayofyear('2006-12-25')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with dayofyear(col1)
 -------------------------------------------------------------------------
@@ -6527,33 +4256,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-2006-01-17
-2006-02-05
-select * from t2 order by col1;
-col1
-2006-01-17
-2006-02-05
-2006-02-25
-select * from t3 order by col1;
-col1
-2006-01-17
-2006-02-05
-2006-02-25
-select * from t4 order by colint;
-colint	col1
-60	2006-01-17
-select * from t5 order by colint;
-colint	col1
-60	2006-01-17
-select * from t6 order by colint;
-colint	col1
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with dayofyear(col1)
 -------------------------------------------------------------------------
@@ -6622,33 +4324,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-05
-select * from t22 order by col1;
-col1
-2006-01-17
-2006-02-05
-2006-02-25
-select * from t33 order by col1;
-col1
-2006-01-17
-2006-02-05
-2006-02-25
-select * from t44 order by colint;
-colint	col1
-60	2006-01-17
-select * from t55 order by colint;
-colint	col1
-60	2006-01-17
-select * from t66 order by colint;
-colint	col1
 -------------------------
 ---- some alter table end
 -------------------------
@@ -6697,14 +4372,12 @@ subpartition by hash(extract(month from 
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(extract(month from col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
@@ -6721,9 +4394,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/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
@@ -6834,14 +4507,12 @@ subpartition by hash(extract(month from 
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(extract(month from col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -6882,81 +4553,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-02-05
-2006-02-17
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-02-05
-2006-02-17
 alter table t55
-partition by list(colint)
-subpartition by hash(extract(month from col1)) 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)
+partition by list(colint) 
+subpartition by hash(extract(month from col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (extract(month from col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN
(1,2,3,4,5,6,7,8,9,10) ENGINE = NDB, PARTITION p1 VALUES IN
(11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2 VALUES IN
(21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (extract(month from col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (extract(year from '1998-11-23')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (extract(year from '1998-11-23')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with extract(month from col1)
 -------------------------------------------------------------------------
@@ -7030,28 +4644,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-02-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-select * from t2 order by col1;
-col1
-select * from t3 order by col1;
-col1
-2006-01-25
-2006-02-05
-2006-02-17
-select * from t4 order by colint;
-colint	col1
-60	2006-02-17
-select * from t5 order by colint;
-colint	col1
-60	2006-02-17
-select * from t6 order by colint;
-colint	col1
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with extract(month from col1)
 -------------------------------------------------------------------------
@@ -7125,28 +4717,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-02-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-select * from t22 order by col1;
-col1
-select * from t33 order by col1;
-col1
-2006-01-25
-2006-02-05
-2006-02-17
-select * from t44 order by colint;
-colint	col1
-60	2006-02-17
-select * from t55 order by colint;
-colint	col1
-60	2006-02-17
-select * from t66 order by colint;
-colint	col1
 -------------------------
 ---- some alter table end
 -------------------------
@@ -7195,14 +4765,12 @@ subpartition by hash(hour(col1)) subpart
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 time) engine='NDB' 
-partition by list(colint)
-subpartition by hash(hour(col1)) subpartitions 2 
-(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)
+partition by list(colint) 
+subpartition by hash(hour(col1)) subpartitions 2 
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 time) engine='NDB' 
 partition by range(colint) 
@@ -7219,9 +4787,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 '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t6;
 select hour(col1) from t1 order by col1;
 hour(col1)
 9
@@ -7332,14 +4900,12 @@ subpartition by hash(hour(col1)) subpart
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(hour(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -7380,81 +4946,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:30:00
-14:30:00
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:30:00
-14:30:00
 alter table t55
-partition by list(colint)
-subpartition by hash(hour(col1)) 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)
+partition by list(colint) 
+subpartition by hash(hour(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (hour(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE =
NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (hour(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	09:09:15
 2	04:30:01
 3	00:59:22
 4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	09:09:15
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (hour('18:30')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	09:09:15
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	09:09:15
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (hour('18:30')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	09:09:15
-2	04:30:01
-3	00:59:22
-4	05:30:34
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with hour(col1)
 -------------------------------------------------------------------------
@@ -7528,31 +5037,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	14:30:00
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-select * from t2 order by col1;
-col1
-14:30:00
-21:59:00
-select * from t3 order by col1;
-col1
-10:30:00
-14:30:00
-21:59:00
-select * from t4 order by colint;
-colint	col1
-60	14:30:00
-select * from t5 order by colint;
-colint	col1
-60	14:30:00
-select * from t6 order by colint;
-colint	col1
-60	14:30:00
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with hour(col1)
 -------------------------------------------------------------------------
@@ -7626,31 +5110,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	14:30:00
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-select * from t22 order by col1;
-col1
-14:30:00
-21:59:00
-select * from t33 order by col1;
-col1
-10:30:00
-14:30:00
-21:59:00
-select * from t44 order by colint;
-colint	col1
-60	14:30:00
-select * from t55 order by colint;
-colint	col1
-60	14:30:00
-select * from t66 order by colint;
-colint	col1
-60	14:30:00
 -------------------------
 ---- some alter table end
 -------------------------
@@ -7699,14 +5158,12 @@ subpartition by hash(microsecond(col1)) 
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 time) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(microsecond(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 time) engine='NDB' 
 partition by range(colint) 
@@ -7723,9 +5180,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 '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t6;
 select microsecond(col1) from t1 order by col1;
 microsecond(col1)
 0
@@ -7836,14 +5293,12 @@ subpartition by hash(microsecond(col1)) 
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(microsecond(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -7884,81 +5339,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-04:30:01
-05:30:34
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-04:30:01
-05:30:34
 alter table t55
-partition by list(colint)
-subpartition by hash(microsecond(col1)) 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)
+partition by list(colint) 
+subpartition by hash(microsecond(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (microsecond(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10)
ENGINE = NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB,
PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES
IN (31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (microsecond(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	05:30:34
 2	04:30:01
 3	00:59:22
 4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	05:30:34
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (microsecond('10:30:10.000010')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	05:30:34
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	05:30:34
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (microsecond('10:30:10.000010')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	05:30:34
-2	04:30:01
-3	00:59:22
-4	05:30:34
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with microsecond(col1)
 -------------------------------------------------------------------------
@@ -8027,29 +5425,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	04:30:01
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-select * from t2 order by col1;
-col1
-select * from t3 order by col1;
-col1
-00:59:22
-04:30:01
-05:30:34
-select * from t4 order by colint;
-colint	col1
-60	04:30:01
-select * from t5 order by colint;
-colint	col1
-60	04:30:01
-select * from t6 order by colint;
-colint	col1
-60	04:30:01
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with microsecond(col1)
 -------------------------------------------------------------------------
@@ -8118,29 +5493,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	04:30:01
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-select * from t22 order by col1;
-col1
-select * from t33 order by col1;
-col1
-00:59:22
-04:30:01
-05:30:34
-select * from t44 order by colint;
-colint	col1
-60	04:30:01
-select * from t55 order by colint;
-colint	col1
-60	04:30:01
-select * from t66 order by colint;
-colint	col1
-60	04:30:01
 -------------------------
 ---- some alter table end
 -------------------------
@@ -8189,14 +5541,12 @@ subpartition by hash(minute(col1)) subpa
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 time) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(minute(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 time) engine='NDB' 
 partition by range(colint) 
@@ -8213,9 +5563,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 '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t6;
 select minute(col1) from t1 order by col1;
 minute(col1)
 9
@@ -8326,14 +5676,12 @@ subpartition by hash(minute(col1)) subpa
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(minute(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -8350,100 +5698,43 @@ col1
 21:59:22
 select * from t33 order by col1;
 col1
-10:24:23
-14:30:45
-21:59:22
-select * from t44 order by colint;
-colint	col1
-1	10:24:23
-2	04:30:01
-3	00:59:22
-4	05:30:34
-select * from t55 order by colint;
-colint	col1
-1	10:24:23
-2	04:30:01
-3	00:59:22
-4	05:30:34
-select * from t66 order by colint;
-colint	col1
-1	10:24:23
-2	04:30:01
-3	00:59:22
-4	05:30:34
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:24:23
-14:30:45
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:24:23
-14:30:45
-alter table t55
-partition by list(colint)
-subpartition by hash(minute(col1)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` time DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (minute(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE
= NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	10:24:23
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
+10:24:23
+14:30:45
+21:59:22
+select * from t44 order by colint;
 colint	col1
 1	10:24:23
 2	04:30:01
 3	00:59:22
 4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (minute('18:30')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+select * from t55 order by colint;
 colint	col1
 1	10:24:23
 2	04:30:01
 3	00:59:22
 4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
 select * from t66 order by colint;
 colint	col1
 1	10:24:23
 2	04:30:01
 3	00:59:22
 4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (minute('18:30')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+---------------------------
+---- some alter table begin
+---------------------------
+alter table t55
+partition by list(colint) 
+subpartition by hash(minute(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+show create table t55;
+Table	Create Table
+t55	CREATE TABLE `t55` (
+  `colint` int(11) DEFAULT NULL,
+  `col1` time DEFAULT NULL
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (minute(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
+select * from t55 order by colint;
 colint	col1
 1	10:24:23
 2	04:30:01
@@ -8522,34 +5813,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	14:30:45
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-10:24:23
-14:30:45
-select * from t2 order by col1;
-col1
-10:24:23
-14:30:45
-21:59:22
-select * from t3 order by col1;
-col1
-10:24:23
-14:30:45
-21:59:22
-select * from t4 order by colint;
-colint	col1
-60	14:30:45
-select * from t5 order by colint;
-colint	col1
-60	14:30:45
-select * from t6 order by colint;
-colint	col1
-60	14:30:45
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with minute(col1)
 -------------------------------------------------------------------------
@@ -8623,34 +5886,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	14:30:45
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-10:24:23
-14:30:45
-select * from t22 order by col1;
-col1
-10:24:23
-14:30:45
-21:59:22
-select * from t33 order by col1;
-col1
-10:24:23
-14:30:45
-21:59:22
-select * from t44 order by colint;
-colint	col1
-60	14:30:45
-select * from t55 order by colint;
-colint	col1
-60	14:30:45
-select * from t66 order by colint;
-colint	col1
-60	14:30:45
 -------------------------
 ---- some alter table end
 -------------------------
@@ -8699,14 +5934,12 @@ subpartition by hash(second(col1)) subpa
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 time) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(second(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 time) engine='NDB' 
 partition by range(colint) 
@@ -8723,9 +5956,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 '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -8836,14 +6069,12 @@ subpartition by hash(second(col1)) subpa
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(second(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -8884,81 +6115,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:22:33
-14:30:20
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:22:33
-14:30:20
 alter table t55
-partition by list(colint)
-subpartition by hash(second(col1)) 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)
+partition by list(colint) 
+subpartition by hash(second(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (second(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE
= NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (second(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	09:09:15
 2	04:30:01
 3	00:59:22
 4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	09:09:15
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (second('18:30:14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	09:09:15
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	09:09:15
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (second('18:30:14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	09:09:15
-2	04:30:01
-3	00:59:22
-4	05:30:34
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with second(col1)
 -------------------------------------------------------------------------
@@ -9032,34 +6206,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	14:30:20
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-10:22:33
-14:30:20
-select * from t2 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t3 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t4 order by colint;
-colint	col1
-60	14:30:20
-select * from t5 order by colint;
-colint	col1
-60	14:30:20
-select * from t6 order by colint;
-colint	col1
-60	14:30:20
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with second(col1)
 -------------------------------------------------------------------------
@@ -9133,34 +6279,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	14:30:20
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-10:22:33
-14:30:20
-select * from t22 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t33 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t44 order by colint;
-colint	col1
-60	14:30:20
-select * from t55 order by colint;
-colint	col1
-60	14:30:20
-select * from t66 order by colint;
-colint	col1
-60	14:30:20
 -------------------------
 ---- some alter table end
 -------------------------
@@ -9209,14 +6327,12 @@ subpartition by hash(second(col1)) subpa
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 char(30)) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(second(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 char(30)) engine='NDB' 
 partition by range(colint) 
@@ -9233,9 +6349,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 '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t6;
 select second(col1) from t1 order by col1;
 second(col1)
 9
@@ -9346,124 +6462,65 @@ subpartition by hash(second(col1)) subpa
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(second(col1)) subpartitions 2 
-(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)
-);
-alter table t66
-partition by range(colint) 
-(partition p0 values less than (second('18:30:14')),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:22:33
-14:30:20
-select * from t22 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t33 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t44 order by colint;
-colint	col1
-1	09:09:15.000002
-2	04:30:01.000018
-3	00:59:22.000024
-4	05:30:34.000037
-select * from t55 order by colint;
-colint	col1
-1	09:09:15.000002
-2	04:30:01.000018
-3	00:59:22.000024
-4	05:30:34.000037
-select * from t66 order by colint;
-colint	col1
-1	09:09:15.000002
-2	04:30:01.000018
-3	00:59:22.000024
-4	05:30:34.000037
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:22:33
-14:30:20
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:22:33
-14:30:20
-alter table t55
-partition by list(colint)
-subpartition by hash(second(col1)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` char(30) DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (second(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE
= NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	09:09:15.000002
-2	04:30:01.000018
-3	00:59:22.000024
-4	05:30:34.000037
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
 alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
+partition by range(colint) 
+(partition p0 values less than (second('18:30:14')),
+partition p1 values less than maxvalue);
+select * from t11 order by col1;
+col1
+10:22:33
+14:30:20
+select * from t22 order by col1;
+col1
+10:22:33
+14:30:20
+21:59:22
+select * from t33 order by col1;
+col1
+10:22:33
+14:30:20
+21:59:22
+select * from t44 order by colint;
 colint	col1
 1	09:09:15.000002
 2	04:30:01.000018
 3	00:59:22.000024
 4	05:30:34.000037
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (second('18:30:14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+select * from t55 order by colint;
 colint	col1
 1	09:09:15.000002
 2	04:30:01.000018
 3	00:59:22.000024
 4	05:30:34.000037
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
 select * from t66 order by colint;
 colint	col1
 1	09:09:15.000002
 2	04:30:01.000018
 3	00:59:22.000024
 4	05:30:34.000037
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (second('18:30:14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+---------------------------
+---- some alter table begin
+---------------------------
+alter table t55
+partition by list(colint) 
+subpartition by hash(second(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+show create table t55;
+Table	Create Table
+t55	CREATE TABLE `t55` (
+  `colint` int(11) DEFAULT NULL,
+  `col1` char(30) DEFAULT NULL
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (second(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
+select * from t55 order by colint;
 colint	col1
 1	09:09:15.000002
 2	04:30:01.000018
@@ -9542,34 +6599,6 @@ colint	col1
 3	00:59:22.000024
 4	05:30:34.000037
 60	14:30:20
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-10:22:33
-14:30:20
-select * from t2 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t3 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t4 order by colint;
-colint	col1
-60	14:30:20
-select * from t5 order by colint;
-colint	col1
-60	14:30:20
-select * from t6 order by colint;
-colint	col1
-60	14:30:20
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with second(col1)
 -------------------------------------------------------------------------
@@ -9643,34 +6672,6 @@ colint	col1
 3	00:59:22.000024
 4	05:30:34.000037
 60	14:30:20
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-10:22:33
-14:30:20
-select * from t22 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t33 order by col1;
-col1
-10:22:33
-14:30:20
-21:59:22
-select * from t44 order by colint;
-colint	col1
-60	14:30:20
-select * from t55 order by colint;
-colint	col1
-60	14:30:20
-select * from t66 order by colint;
-colint	col1
-60	14:30:20
 -------------------------
 ---- some alter table end
 -------------------------
@@ -9719,14 +6720,12 @@ subpartition by hash(month(col1)) subpar
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(month(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
@@ -9743,9 +6742,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t6;
 select month(col1) from t1 order by col1;
 month(col1)
 1
@@ -9856,14 +6855,12 @@ subpartition by hash(month(col1)) subpar
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(month(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -9904,81 +6901,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-11-06
-2006-12-17
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-11-06
-2006-12-17
 alter table t55
-partition by list(colint)
-subpartition by hash(month(col1)) 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)
+partition by list(colint) 
+subpartition by hash(month(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (month(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10) ENGINE
= NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2
VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (month(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (month('2006-10-14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (month('2006-10-14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with month(col1)
 -------------------------------------------------------------------------
@@ -10052,31 +6992,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-12-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-select * from t2 order by col1;
-col1
-2006-11-06
-2006-12-17
-select * from t3 order by col1;
-col1
-2006-05-25
-2006-11-06
-2006-12-17
-select * from t4 order by colint;
-colint	col1
-60	2006-12-17
-select * from t5 order by colint;
-colint	col1
-60	2006-12-17
-select * from t6 order by colint;
-colint	col1
-60	2006-12-17
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with month(col1)
 -------------------------------------------------------------------------
@@ -10150,31 +7065,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-12-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-select * from t22 order by col1;
-col1
-2006-11-06
-2006-12-17
-select * from t33 order by col1;
-col1
-2006-05-25
-2006-11-06
-2006-12-17
-select * from t44 order by colint;
-colint	col1
-60	2006-12-17
-select * from t55 order by colint;
-colint	col1
-60	2006-12-17
-select * from t66 order by colint;
-colint	col1
-60	2006-12-17
 -------------------------
 ---- some alter table end
 -------------------------
@@ -10223,14 +7113,12 @@ subpartition by hash(quarter(col1)) subp
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(quarter(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
@@ -10247,9 +7135,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t6;
 select quarter(col1) from t1 order by col1;
 quarter(col1)
 1
@@ -10360,14 +7248,12 @@ subpartition by hash(quarter(col1)) subp
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(quarter(col1)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -10380,104 +7266,47 @@ col1
 select * from t22 order by col1;
 col1
 2006-07-30
-2006-09-25
-2006-12-17
-select * from t33 order by col1;
-col1
-2006-07-30
-2006-09-25
-2006-12-17
-select * from t44 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-select * from t55 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
----------------------------
----- some alter table begin
----------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-07-30
-2006-12-17
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-07-30
-2006-12-17
-alter table t55
-partition by list(colint)
-subpartition by hash(quarter(col1)) 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;
-Table	Create Table
-t55	CREATE TABLE `t55` (
-  `colint` int(11) DEFAULT NULL,
-  `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (quarter(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10)
ENGINE = NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB,
PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES
IN (31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
-select * from t55 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
+2006-09-25
+2006-12-17
+select * from t33 order by col1;
+col1
+2006-07-30
+2006-09-25
+2006-12-17
+select * from t44 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (quarter('2006-10-14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+select * from t55 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
 select * from t66 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (quarter('2006-10-14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
+---------------------------
+---- some alter table begin
+---------------------------
+alter table t55
+partition by list(colint) 
+subpartition by hash(quarter(col1)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
+);
+show create table t55;
+Table	Create Table
+t55	CREATE TABLE `t55` (
+  `colint` int(11) DEFAULT NULL,
+  `col1` date DEFAULT NULL
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (quarter(col1)) SUBPARTITIONS 4 (PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
+select * from t55 order by colint;
 colint	col1
 1	2006-02-03
 2	2006-01-17
@@ -10556,30 +7385,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-12-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-select * from t2 order by col1;
-col1
-select * from t3 order by col1;
-col1
-2006-07-30
-2006-09-25
-2006-12-17
-select * from t4 order by colint;
-colint	col1
-60	2006-12-17
-select * from t5 order by colint;
-colint	col1
-60	2006-12-17
-select * from t6 order by colint;
-colint	col1
-4	2006-02-05
-60	2006-12-17
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with quarter(col1)
 -------------------------------------------------------------------------
@@ -10653,30 +7458,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-12-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-select * from t22 order by col1;
-col1
-select * from t33 order by col1;
-col1
-2006-07-30
-2006-09-25
-2006-12-17
-select * from t44 order by colint;
-colint	col1
-60	2006-12-17
-select * from t55 order by colint;
-colint	col1
-60	2006-12-17
-select * from t66 order by colint;
-colint	col1
-4	2006-02-05
-60	2006-12-17
 -------------------------
 ---- some alter table end
 -------------------------
@@ -10725,14 +7506,12 @@ subpartition by hash(time_to_sec(col1)-(
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 time) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(time_to_sec(col1)-(time_to_sec(col1)-20)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 time) engine='NDB' 
 partition by range(colint) 
@@ -10749,9 +7528,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 '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_time.inc' into table
t5;
+load data infile '../std_data_ln/parts/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
@@ -10862,14 +7641,12 @@ subpartition by hash(time_to_sec(col1)-(
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(time_to_sec(col1)-(time_to_sec(col1)-20)) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -10910,81 +7687,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:33:11
-14:30:45
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-10:33:11
-14:30:45
 alter table t55
-partition by list(colint)
-subpartition by hash(time_to_sec(col1)-(time_to_sec(col1)-20)) 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)
+partition by list(colint) 
+subpartition by hash(time_to_sec(col1)-(time_to_sec(col1)-20)) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` time DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (time_to_sec(col1)-(time_to_sec(col1)-20)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN
(1,2,3,4,5,6,7,8,9,10) ENGINE = NDB, PARTITION p1 VALUES IN
(11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2 VALUES IN
(21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (time_to_sec(col1)-(time_to_sec(col1)-20)) SUBPARTITIONS 4
(PARTITION p0 VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	10:33:11
 2	04:30:01
 3	00:59:22
 4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	10:33:11
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (time_to_sec('18:30:14')-(time_to_sec('17:59:59'))),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	10:33:11
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	10:33:11
-2	04:30:01
-3	00:59:22
-4	05:30:34
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (time_to_sec('18:30:14')-(time_to_sec('17:59:59'))),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	10:33:11
-2	04:30:01
-3	00:59:22
-4	05:30:34
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with time_to_sec(col1)-(time_to_sec(col1)-20)
 -------------------------------------------------------------------------
@@ -11058,33 +7778,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	14:30:45
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-10:33:11
-14:30:45
-select * from t2 order by col1;
-col1
-10:33:11
-14:30:45
-21:59:22
-select * from t3 order by col1;
-col1
-10:33:11
-14:30:45
-21:59:22
-select * from t4 order by colint;
-colint	col1
-60	14:30:45
-select * from t5 order by colint;
-colint	col1
-60	14:30:45
-select * from t6 order by colint;
-colint	col1
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with time_to_sec(col1)-(time_to_sec(col1)-20)
 -------------------------------------------------------------------------
@@ -11158,33 +7851,6 @@ colint	col1
 3	00:59:22
 4	05:30:34
 60	14:30:45
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-10:33:11
-14:30:45
-select * from t22 order by col1;
-col1
-10:33:11
-14:30:45
-21:59:22
-select * from t33 order by col1;
-col1
-10:33:11
-14:30:45
-21:59:22
-select * from t44 order by colint;
-colint	col1
-60	14:30:45
-select * from t55 order by colint;
-colint	col1
-60	14:30:45
-select * from t66 order by colint;
-colint	col1
 -------------------------
 ---- some alter table end
 -------------------------
@@ -11233,14 +7899,12 @@ subpartition by hash(to_days(col1)-to_da
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(to_days(col1)-to_days('2006-01-01')) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
@@ -11257,9 +7921,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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/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
@@ -11370,14 +8034,12 @@ subpartition by hash(to_days(col1)-to_da
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
+partition by list(colint) 
 subpartition by hash(to_days(col1)-to_days('2006-01-01')) subpartitions 2 
-(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)
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
@@ -11418,81 +8080,24 @@ colint	col1
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-06
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-06
 alter table t55
-partition by list(colint)
-subpartition by hash(to_days(col1)-to_days('2006-01-01')) 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)
+partition by list(colint) 
+subpartition by hash(to_days(col1)-to_days('2006-01-01')) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (to_days(col1)-to_days('2006-01-01')) SUBPARTITIONS 5 (PARTITION p0 VALUES IN
(1,2,3,4,5,6,7,8,9,10) ENGINE = NDB, PARTITION p1 VALUES IN
(11,12,13,14,15,16,17,18,19,20) ENGINE = NDB, PARTITION p2 VALUES IN
(21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES IN
(31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (to_days(col1)-to_days('2006-01-01')) SUBPARTITIONS 4 (PARTITION p0
VALUES IN
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
 1	2006-02-06
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-06
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (to_days('2006-02-02')-to_days('2006-01-01')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-06
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-06
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (to_days('2006-02-02')-to_days('2006-01-01')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-06
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with to_days(col1)-to_days('2006-01-01')
 -------------------------------------------------------------------------
@@ -11553,41 +8158,13 @@ select * from t5 order by colint;
 colint	col1
 1	2006-02-06
 3	2006-01-25
-4	2006-02-05
-60	2006-01-17
-select * from t6 order by colint;
-colint	col1
-1	2006-02-06
-3	2006-01-25
-4	2006-02-05
-60	2006-01-17
-alter table t1 drop partition p0;
-alter table t2 drop partition p0;
-alter table t4 drop partition p0;
-alter table t5 drop partition p0;
-alter table t6 drop partition p0;
-select * from t1 order by col1;
-col1
-2006-01-17
-2006-02-06
-select * from t2 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-06
-select * from t3 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-06
-select * from t4 order by colint;
-colint	col1
-60	2006-01-17
-select * from t5 order by colint;
-colint	col1
+4	2006-02-05
 60	2006-01-17
 select * from t6 order by colint;
 colint	col1
+1	2006-02-06
+3	2006-01-25
+4	2006-02-05
 60	2006-01-17
 -------------------------------------------------------------------------
 ---  Delete rows and partitions of tables with to_days(col1)-to_days('2006-01-01')
@@ -11657,34 +8234,6 @@ colint	col1
 3	2006-01-25
 4	2006-02-05
 60	2006-01-17
-alter table t11 drop partition p0;
-alter table t22 drop partition p0;
-alter table t44 drop partition p0;
-alter table t55 drop partition p0;
-alter table t66 drop partition p0;
-select * from t11 order by col1;
-col1
-2006-01-17
-2006-02-06
-select * from t22 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-06
-select * from t33 order by col1;
-col1
-2006-01-17
-2006-01-25
-2006-02-06
-select * from t44 order by colint;
-colint	col1
-60	2006-01-17
-select * from t55 order by colint;
-colint	col1
-60	2006-01-17
-select * from t66 order by colint;
-colint	col1
-60	2006-01-17
 -------------------------
 ---- some alter table end
 -------------------------
@@ -11701,7 +8250,7 @@ drop table if exists t44 ;
 drop table if exists t55 ;
 drop table if exists t66 ;
 -------------------------------------------------------------------------
----  weekday(col1)  in partition with coltype  date
+---  datediff(col1, '2006-01-01')  in partition with coltype  date
 -------------------------------------------------------------------------
 drop table if exists t1 ;
 drop table if exists t2 ;
@@ -11710,14 +8259,14 @@ drop table if exists t4 ;
 drop table if exists t5 ;
 drop table if exists t6 ;
 -------------------------------------------------------------------------
----  Create tables with weekday(col1)
+---  Create tables with datediff(col1, '2006-01-01')
 -------------------------------------------------------------------------
 create table t1 (col1 date) engine='NDB' 
-partition by range(weekday(col1)) 
+partition by range(datediff(col1, '2006-01-01')) 
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t2 (col1 date) engine='NDB' 
-partition by list(weekday(col1)) 
+partition by list(datediff(col1, '2006-01-01')) 
 (partition p0 values in (0,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),
@@ -11726,58 +8275,56 @@ partition p4 values in (41,42,43,44,45,4
 partition p5 values in (51,52,53,54,55,56,57,58,59,60)
 );
 create table t3 (col1 date) engine='NDB' 
-partition by hash(weekday(col1));
+partition by hash(datediff(col1, '2006-01-01'));
 create table t4 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
-subpartition by hash(weekday(col1)) subpartitions 2 
+subpartition by hash(datediff(col1, '2006-01-01')) subpartitions 2 
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 create table t5 (colint int, col1 date) engine='NDB' 
-partition by list(colint)
-subpartition by hash(weekday(col1)) subpartitions 2 
-(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)
+partition by list(colint) 
+subpartition by hash(datediff(col1, '2006-01-01')) subpartitions 2 
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 create table t6 (colint int, col1 date) engine='NDB' 
 partition by range(colint) 
-(partition p0 values less than (weekday('2006-10-14')),
+(partition p0 values less than (datediff('2006-02-02', '2006-01-01')),
 partition p1 values less than maxvalue);
 -------------------------------------------------------------------------
----  Access tables with weekday(col1) 
+---  Access tables with datediff(col1, '2006-01-01') 
 -------------------------------------------------------------------------
-insert into t1 values ('2006-12-03');
-insert into t1 values ('2006-11-17');
-insert into t2 values ('2006-12-03');
-insert into t2 values ('2006-11-17');
-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;
-select weekday(col1) from t1 order by col1;
-weekday(col1)
-4
-6
+insert into t1 values ('2006-02-03');
+insert into t1 values ('2006-01-17');
+insert into t2 values ('2006-02-03');
+insert into t2 values ('2006-01-17');
+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 '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t4;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t5;
+load data infile '../std_data_ln/parts/part_supported_sql_funcs_int_date.inc' into table
t6;
+select datediff(col1, '2006-01-01') from t1 order by col1;
+datediff(col1, '2006-01-01')
+16
+33
 select * from t1 order by col1;
 col1
-2006-11-17
-2006-12-03
+2006-01-17
+2006-02-03
 select * from t2 order by col1;
 col1
-2006-05-25
-2006-11-17
-2006-12-03
+2006-01-17
+2006-01-25
+2006-02-03
 select * from t3 order by col1;
 col1
-2006-05-25
-2006-11-17
-2006-12-03
+2006-01-17
+2006-01-25
+2006-02-03
 select * from t4 order by colint;
 colint	col1
 1	2006-02-03
@@ -11796,46 +8343,46 @@ colint	col1
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
-update t1 set col1='2006-02-06' where col1='2006-12-03';
-update t2 set col1='2006-02-06' where col1='2006-12-03';
-update t3 set col1='2006-02-06' where col1='2006-12-03';
-update t4 set col1='2006-02-06' where col1='2006-12-03';
-update t5 set col1='2006-02-06' where col1='2006-12-03';
-update t6 set col1='2006-02-06' where col1='2006-12-03';
+update t1 set col1='2006-02-06' where col1='2006-02-03';
+update t2 set col1='2006-02-06' where col1='2006-02-03';
+update t3 set col1='2006-02-06' where col1='2006-02-03';
+update t4 set col1='2006-02-06' where col1='2006-02-03';
+update t5 set col1='2006-02-06' where col1='2006-02-03';
+update t6 set col1='2006-02-06' where col1='2006-02-03';
 select * from t1 order by col1;
 col1
+2006-01-17
 2006-02-06
-2006-11-17
 select * from t2 order by col1;
 col1
+2006-01-17
+2006-01-25
 2006-02-06
-2006-05-25
-2006-11-17
 select * from t3 order by col1;
 col1
+2006-01-17
+2006-01-25
 2006-02-06
-2006-05-25
-2006-11-17
 select * from t4 order by colint;
 colint	col1
-1	2006-02-03
+1	2006-02-06
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
 select * from t5 order by colint;
 colint	col1
-1	2006-02-03
+1	2006-02-06
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
 select * from t6 order by colint;
 colint	col1
-1	2006-02-03
+1	2006-02-06
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
 -------------------------------------------------------------------------
----  Alter tables with weekday(col1)
+---  Alter tables with datediff(col1, '2006-01-01')
 -------------------------------------------------------------------------
 drop table if exists t11 ;
 drop table if exists t22 ;
@@ -11850,11 +8397,11 @@ create table t44 engine='NDB' as select 
 create table t55 engine='NDB' as select * from t5;
 create table t66 engine='NDB' as select * from t6;
 alter table t11
-partition by range(weekday(col1)) 
+partition by range(datediff(col1, '2006-01-01')) 
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t22
-partition by list(weekday(col1)) 
+partition by list(datediff(col1, '2006-01-01')) 
 (partition p0 values in (0,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),
@@ -11863,328 +8410,213 @@ partition p4 values in (41,42,43,44,45,4
 partition p5 values in (51,52,53,54,55,56,57,58,59,60)
 );
 alter table t33
-partition by hash(weekday(col1));
+partition by hash(datediff(col1, '2006-01-01'));
 alter table t44
 partition by range(colint) 
-subpartition by hash(weekday(col1)) subpartitions 2 
+subpartition by hash(datediff(col1, '2006-01-01')) subpartitions 2 
 (partition p0 values less than (15),
 partition p1 values less than maxvalue);
 alter table t55
-partition by list(colint)
-subpartition by hash(weekday(col1)) subpartitions 2 
-(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)
+partition by list(colint) 
+subpartition by hash(datediff(col1, '2006-01-01')) subpartitions 2 
+(partition p0 values in (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15),
+partition p1 values in (16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p2 values in (31,32,33,34,35,36,37,38,39,40,41,42,43,44,45),
+partition p3 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 alter table t66
 partition by range(colint) 
-(partition p0 values less than (weekday('2006-10-14')),
+(partition p0 values less than (datediff('2006-02-02', '2006-01-01')),
 partition p1 values less than maxvalue);
 select * from t11 order by col1;
 col1
+2006-01-17
 2006-02-06
-2006-11-17
 select * from t22 order by col1;
 col1
+2006-01-17
+2006-01-25
 2006-02-06
-2006-05-25
-2006-11-17
 select * from t33 order by col1;
 col1
+2006-01-17
+2006-01-25
 2006-02-06
-2006-05-25
-2006-11-17
 select * from t44 order by colint;
 colint	col1
-1	2006-02-03
+1	2006-02-06
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
 select * from t55 order by colint;
 colint	col1
-1	2006-02-03
+1	2006-02-06
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
 select * from t66 order by colint;
 colint	col1
-1	2006-02-03
+1	2006-02-06
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
 ---------------------------
 ---- some alter table begin
 ---------------------------
-alter table t11
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-02-06
-2006-11-17
-alter table t11
-reorganize partition s1 into
-(partition p0 values less than (15),
-partition p1 values less than maxvalue);
-select * from t11 order by col1;
-col1
-2006-02-06
-2006-11-17
 alter table t55
-partition by list(colint)
-subpartition by hash(weekday(col1)) 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)
+partition by list(colint) 
+subpartition by hash(datediff(col1, '2006-01-01')) subpartitions 4 
+(partition p0 values in
(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30),
+partition p1 values in
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 );
 show create table t55;
 Table	Create Table
 t55	CREATE TABLE `t55` (
   `colint` int(11) DEFAULT NULL,
   `col1` date DEFAULT NULL
-) ENGINE=NDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint) SUBPARTITION BY
HASH (weekday(col1)) SUBPARTITIONS 5 (PARTITION p0 VALUES IN (1,2,3,4,5,6,7,8,9,10)
ENGINE = NDB, PARTITION p1 VALUES IN (11,12,13,14,15,16,17,18,19,20) ENGINE = NDB,
PARTITION p2 VALUES IN (21,22,23,24,25,26,27,28,29,30) ENGINE = NDB, PARTITION p3 VALUES
IN (31,32,33,34,35,36,37,38,39,40) ENGINE = NDB, PARTITION p4 VALUES IN
(41,42,43,44,45,46,47,48,49,50) ENGINE = NDB, PARTITION p5 VALUES IN
(51,52,53,54,55,56,57,58,59,60) ENGINE = NDB) */
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (colint)
SUBPARTITION BY HASH (datediff(col1, '2006-01-01')) SUBPARTITIONS 4 (PARTITION p0 VALUES
IN (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30)
ENGINE = ndbcluster, PARTITION p1 VALUES IN
(31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
ENGINE = ndbcluster) */
 select * from t55 order by colint;
 colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (weekday('2006-10-14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition p0,p1 into
-(partition s1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
-2	2006-01-17
-3	2006-01-25
-4	2006-02-05
-alter table t66
-reorganize partition s1 into
-(partition p0 values less than (weekday('2006-10-14')),
-partition p1 values less than maxvalue);
-select * from t66 order by colint;
-colint	col1
-1	2006-02-03
+1	2006-02-06
 2	2006-01-17
 3	2006-01-25
 4	2006-02-05
 -------------------------------------------------------------------------
----  Delete rows and partitions of tables with weekday(col1)
+---  Delete rows and partitions of tables with datediff(col1, '2006-01-01')
 -------------------------------------------------------------------------
-delete from t1 where col1='2006-11-17';
-delete from t2 where col1='2006-11-17';
-delete from t3 where col1='2006-11-17';
-delete from t4 where col1='2006-11-17';
-delete from t5 where col1='2006-11-17';
-delete from t6 where col1='2006-11-17';
+delete from t1 where col1='2006-01-17';
+delete from t2 where col1='2006-01-17';
+delete from t3 where col1='2006-01-17';
+delete from t4 where col1='2006-01-17';
+delete from t5 where col1='2006-01-17';
+delete from t6 where col1='2006-01-17';
 select * from t1 order by col1;
 col1
 2006-02-06
 select * from t2 order by col1;
 col1
+2006-01-25
 2006-02-06
-2006-05-25
 select * from t3 order by col1;
 col1
+2006-01-25
 2006-02-06
-2006-05-25
 select * from t4 order by colint;
 colint	col1
-1	2006-02-03
-2	2006-01-17
+1	2006-02-06
 3	2006-01-25
 4	2006-02-05
 select * from t5 order by colint;
 colint	col1
-1	2006-02-03
-2	2006-01-17
+1	2006-02-06
 3	2006-01-25
 4	2006-02-05
-insert into t1 values ('2006-11-17');