Commit 8c0300da authored by istruewing@stella.local's avatar istruewing@stella.local
Browse files

Merge stella.local:/home2/mydev/mysql-5.1-ateam 

into  stella.local:/home2/mydev/mysql-5.1-axmrg
parents 7157f0d2 65992efc

mysql-test/r/partition_not_windows.result

+29 −11
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ partition by range (a) 
subpartition by hash (a)

(partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp'

(SUBPARTITION subpart00, SUBPARTITION subpart01));

Checking if file exists before alter

# Checking if file exists before alter

ALTER TABLE t1 REORGANIZE PARTITION p0 INTO

(partition p1 VALUES LESS THAN (1) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp'

(SUBPARTITION subpart10, SUBPARTITION subpart11),

partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'MYSQLTEST_VARDIR/tmp' INDEX DIRECTORY = 'MYSQLTEST_VARDIR/tmp'

(SUBPARTITION subpart20, SUBPARTITION subpart21));

Checking if file exists after alter

# Checking if file exists after alter

drop table t1;

set @org_mode=@@sql_mode;

set @@sql_mode='NO_DIR_IN_CREATE';
@@ -36,11 +36,11 @@ set @@sql_mode=@org_mode; 
CREATE TABLE t1(a INT)

PARTITION BY KEY (a)

(PARTITION p0 DATA DIRECTORY 'TEST_DIR/master-data/test');

ERROR HY000: Incorrect arguments to DATA DIRECORY

ERROR HY000: Incorrect arguments to DATA DIRECTORY

CREATE TABLE t1(a INT)

PARTITION BY KEY (a)

(PARTITION p0 INDEX DIRECTORY 'TEST_DIR/master-data/test');

ERROR HY000: Incorrect arguments to INDEX DIRECORY

ERROR HY000: Incorrect arguments to INDEX DIRECTORY

CREATE TABLE ts (id INT, purchased DATE)

PARTITION BY RANGE(YEAR(purchased))

SUBPARTITION BY HASH(TO_DAYS(purchased)) (
@@ -50,7 +50,7 @@ DATA DIRECTORY = 'TEST_DIR/master-data/test', 
SUBPARTITION s0b

DATA DIRECTORY = 'TEST_DIR/master-data/test'

));

ERROR HY000: Incorrect arguments to DATA DIRECORY

ERROR HY000: Incorrect arguments to DATA DIRECTORY

CREATE TABLE ts (id INT, purchased DATE)

PARTITION BY RANGE(YEAR(purchased))

SUBPARTITION BY HASH(TO_DAYS(purchased)) (
@@ -60,7 +60,7 @@ INDEX DIRECTORY = 'TEST_DIR/master-data/test', 
SUBPARTITION s0b

INDEX DIRECTORY = 'TEST_DIR/master-data/test'

));

ERROR HY000: Incorrect arguments to INDEX DIRECORY

ERROR HY000: Incorrect arguments to INDEX DIRECTORY

DROP TABLE IF EXISTS `example`;

CREATE TABLE `example` (

`ID_EXAMPLE` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -69,9 +69,27 @@ CREATE TABLE `example` ( 
PRIMARY KEY (`ID_EXAMPLE`)

) ENGINE = MYISAM 

PARTITION BY HASH(ID_EXAMPLE)(

PARTITION p0 DATA DIRECTORY = '/build/5.1/data/partitiontest/p0Data',

PARTITION p1 DATA DIRECTORY = '/build/5.1/data/partitiontest/p1Data',

PARTITION p2 DATA DIRECTORY = '/build/5.1/data/partitiontest/p2Data',

PARTITION p3 DATA DIRECTORY = '/build/5.1/data/partitiontest/p3Data'

PARTITION p0 DATA DIRECTORY = 'MYSQLTEST_VARDIR/p0Data'

INDEX DIRECTORY = 'MYSQLTEST_VARDIR/p0Index',

PARTITION p1 DATA DIRECTORY = 'MYSQLTEST_VARDIR/p1Data'

INDEX DIRECTORY = 'MYSQLTEST_VARDIR/p1Index',

PARTITION p2 DATA DIRECTORY = 'MYSQLTEST_VARDIR/p2Data'

INDEX DIRECTORY = 'MYSQLTEST_VARDIR/p2Index',

PARTITION p3 DATA DIRECTORY = 'MYSQLTEST_VARDIR/p3Data'

INDEX DIRECTORY = 'MYSQLTEST_VARDIR/p3Index'

);

ERROR HY000: Can't create/write to file '/build/5.1/data/partitiontest/p0Data/example#P#p0.MYD' (Errcode: 2)
 
# Checking that MyISAM .MYD and .MYI are in test db and data/idx dir

DROP TABLE example;

CREATE TABLE `example` (

`ID_EXAMPLE` int(10) unsigned NOT NULL AUTO_INCREMENT,

`DESCRIPTION` varchar(30) NOT NULL,

`LEVEL` smallint(5) unsigned DEFAULT NULL,

PRIMARY KEY (`ID_EXAMPLE`)

) ENGINE = MYISAM 

PARTITION BY HASH(ID_EXAMPLE)(

PARTITION p0 DATA DIRECTORY = '/not/existent/p0Data',

PARTITION p1 DATA DIRECTORY = '/not/existent/p1Data',

PARTITION p2 DATA DIRECTORY = '/not/existent/p2Data',

PARTITION p3 DATA DIRECTORY = '/not/existent/p3Data'

);

Got one of the listed errors

mysql-test/r/partition_symlink.result

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,13 @@ Got one of the listed errors 
DROP DATABASE mysqltest2;

USE test;

DROP USER mysqltest_1@localhost;

create table t2 (i int )

partition by range (i)

(

partition p01 values less than (1000)

data directory="MYSQLTEST_VARDIR/tmp"

    index directory="MYSQLTEST_VARDIR/tmp"

);

set @org_mode=@@sql_mode;

set @@sql_mode='NO_DIR_IN_CREATE';

select @@sql_mode;

mysql-test/r/symlink.result

+13 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ insert into t1 (b) select b from t2; 
insert into t2 (b) select b from t1;

insert into t1 (b) select b from t2;

drop table t2;

create table t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="MYSQLTEST_VARDIR/tmp" index directory="MYSQLTEST_VARDIR/run";

insert into t9 select * from t1;

check table t9;

Table	Op	Msg_type	Msg_text
@@ -54,10 +55,16 @@ t9 CREATE TABLE `t9` ( 
  `d` int(11) NOT NULL,

  PRIMARY KEY (`a`)

) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/' INDEX DIRECTORY='MYSQLTEST_VARDIR/run/'

create table t1 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="tmp";

Got one of the listed errors

create database mysqltest;

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="/this-dir-does-not-exist";

Got one of the listed errors

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="not-hard-path";

Got one of the listed errors

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam index directory="MYSQLTEST_VARDIR/run";

Got one of the listed errors

create table mysqltest.t9 (a int not null auto_increment, b char(16) not null, primary key (a)) engine=myisam data directory="MYSQLTEST_VARDIR/tmp";

Got one of the listed errors

alter table t9 rename mysqltest.t9;

select count(*) from mysqltest.t9;
@@ -74,6 +81,7 @@ t9 CREATE TABLE `t9` ( 
) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/tmp/' INDEX DIRECTORY='MYSQLTEST_VARDIR/run/'

drop database mysqltest;

create table t1 (a int not null) engine=myisam;

alter table t1 data directory="MYSQLTEST_VARDIR/tmp";

Warnings:

Warning	0	DATA DIRECTORY option ignored

show create table t1;
@@ -82,6 +90,7 @@ t1 CREATE TABLE `t1` ( 
  `a` int(11) NOT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 add b int;

alter table t1 data directory="MYSQLTEST_VARDIR/log";

Warnings:

Warning	0	DATA DIRECTORY option ignored

show create table t1;
@@ -90,6 +99,7 @@ t1 CREATE TABLE `t1` ( 
  `a` int(11) NOT NULL,

  `b` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 index directory="MYSQLTEST_VARDIR/log";

Warnings:

Warning	0	INDEX DIRECTORY option ignored

show create table t1;
@@ -102,18 +112,20 @@ drop table t1; 
CREATE TABLE t1(a INT)

DATA DIRECTORY='TEST_DIR/tmp'

INDEX DIRECTORY='TEST_DIR/tmp';

ERROR HY000: Can't create/write to file 'TEST_DIR/tmp/t1.MYI' (Errcode: 17)

Got one of the listed errors

CREATE TABLE t2(a INT)

DATA DIRECTORY='TEST_DIR/tmp'

INDEX DIRECTORY='TEST_DIR/tmp';

RENAME TABLE t2 TO t1;

ERROR HY000: Can't create/write to file 'TEST_DIR/tmp/t1.MYI' (Errcode: 17)

DROP TABLE t2;

create temporary table t1 (a int) engine=myisam data directory="MYSQLTEST_VARDIR/log" select 9 a;

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/log/'

create temporary table t1 (a int) engine=myisam data directory="MYSQLTEST_VARDIR/log" select 99 a;

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

mysql-test/suite/parts/inc/partition_basic_symlink.inc

+22 −137
Original line number Diff line number Diff line
@@ -16,144 +16,29 @@ 
--enable_abort_on_error



--echo

--echo #========================================================================

--echo #  Check partitioning methods on just created tables

--echo #  The tables should be defined without/with PRIMARY KEY and

--echo #  UNIQUE INDEXes.

--echo #  Every test round has to check

--echo #        PARTITION BY HASH/KEY/LIST/RANGE

--echo #        PARTITION BY RANGE/LIST ... SUBPARTITION BY HASH/KEY ...

--echo #========================================================================

--echo #------------------------------------------------------------------------

--echo #  1   Tables without PRIMARY KEY or UNIQUE INDEXes

--echo #------------------------------------------------------------------------

--echo #  1.1 The partitioning function contains one column.

let $unique= ;

--source suite/parts/inc/partition_methods1.inc

#

   --echo # 1.1.1 with DATA DIECTORY/INDEX DIRECTORY

   #

   --disable_query_log



# DATA DIRECTORY

# Make directory for partition data

   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true

   eval SET @data_dir = 'DATA DIRECTORY =

   ''''$MYSQLTEST_VARDIR/master-data/test/data''''';

   let $data_directory = `select @data_dir`;

let $data_dir_path= $MYSQLTEST_VARDIR/mysql-test-data-dir;

--mkdir $data_dir_path

let $data_directory= DATA DIRECTORY = '$data_dir_path';



#INDEX DIRECTORY

# Make directory for partition index

   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true

   eval SET @indx_dir = 'INDEX DIRECTORY =

   ''''$MYSQLTEST_VARDIR/master-data/test/index''''';

   let $index_directory = `select @indx_dir`;

let $idx_dir_path= $MYSQLTEST_VARDIR/mysql-test-idx-dir;

--mkdir $idx_dir_path

let $index_directory= INDEX DIRECTORY = '$idx_dir_path';



let $with_directories= 1;

   --source suite/parts/inc/partition_methods1.inc

--echo #========================================================================

--echo # 0.5 use partition_basic with DATA/INDEX DIRECTORY

--echo #========================================================================

--source suite/parts/inc/partition_basic.inc

--echo #========================================================================

--echo # 5 use partition_directory with DATA/INDEX DIRECTORY

--echo #========================================================================

--source suite/parts/inc/partition_directory.inc

--rmdir $data_dir_path

--rmdir $idx_dir_path

let $with_directories= 0;
 
   --enable_query_log

   #

--echo #  1.2 The partitioning function contains two columns.

let $unique= ;

--source suite/parts/inc/partition_methods2.inc

#

--echo #------------------------------------------------------------------------

--echo #  2   Tables with PRIMARY KEY and/or UNIQUE INDEXes

--echo #        The partitioning function contains one column.

--echo #------------------------------------------------------------------------

if ($more_pk_ui_tests)

{

   if ($do_pk_tests)

   {

      --echo #  2.1 PRIMARY KEY consisting of one column

      let $unique= , PRIMARY KEY(f_int1);

      --source suite/parts/inc/partition_methods1.inc

   }

   --echo #  2.2 UNIQUE INDEX consisting of one column

   let $unique= , UNIQUE INDEX uidx1 (f_int1);

   --source suite/parts/inc/partition_methods1.inc



   --echo # 2.2.1 with DATA DIECTORY/INDEX DIRECTORY

   #

   --disable_query_log

   # DATA DIRECTORY

   # Make directory for partition data

   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/data || true

   eval SET @data_dir = 'DATA DIRECTORY =

   ''''$MYSQLTEST_VARDIR/master-data/test/data''''';

   let $data_directory = `select @data_dir`;



   #INDEX DIRECTORY

   # Make directory for partition index

   --exec mkdir $MYSQLTEST_VARDIR/master-data/test/index || true

   eval SET @indx_dir = 'INDEX DIRECTORY =

   ''''$MYSQLTEST_VARDIR/master-data/test/index''''';

   let $index_directory = `select @indx_dir`;



   let $with_directories= TRUE;

   --source suite/parts/inc/partition_methods1.inc

   let $with_directories= FALSE;

   --enable_query_log

   #

   if ($do_pk_tests)

   {

      --echo #  2.3 PRIMARY KEY consisting of two columns

      let $unique= , PRIMARY KEY(f_int1,f_int2);

      --source suite/parts/inc/partition_methods1.inc

      let $unique= , PRIMARY KEY(f_int2,f_int1);

      --source suite/parts/inc/partition_methods1.inc

   }

   #

   --echo #  2.4 UNIQUE INDEX consisting of two columns

   let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);

   --source suite/parts/inc/partition_methods1.inc

   let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);

   --source suite/parts/inc/partition_methods1.inc

   #

}

--echo #  2.5 PRIMARY KEY + UNIQUE INDEX consisting of two columns

if ($do_pk_tests)

{

   let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);

   --source suite/parts/inc/partition_methods1.inc

   let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);

   --source suite/parts/inc/partition_methods1.inc

}

let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);

--source suite/parts/inc/partition_methods1.inc



--echo #------------------------------------------------------------------------

--echo #  3   Tables with PRIMARY KEY and/or UNIQUE INDEXes

--echo #        The partitioning function contains two columns.

--echo #------------------------------------------------------------------------

#

if ($more_pk_ui_tests)

{

   if ($do_pk_tests)

   {

      --echo #  3.1 PRIMARY KEY consisting of two columns

      let $unique= , PRIMARY KEY(f_int1,f_int2);

      --source suite/parts/inc/partition_methods2.inc



      let $unique= , PRIMARY KEY(f_int2,f_int1);

      --source suite/parts/inc/partition_methods2.inc

   }

   #

   --echo #  3.2 UNIQUE INDEX consisting of two columns

   let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);

   --source suite/parts/inc/partition_methods2.inc

   let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);

   --source suite/parts/inc/partition_methods2.inc

}

#

--echo #  3.3 PRIMARY KEY and UNIQUE INDEX consisting of two columns

if ($do_pk_tests)

{

   let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);

   --source suite/parts/inc/partition_methods2.inc

   let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);

   --source suite/parts/inc/partition_methods2.inc

}

let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);

--source suite/parts/inc/partition_methods2.inc

mysql-test/suite/parts/inc/partition_directory.inc

+27 −44
Original line number Diff line number Diff line
@@ -29,41 +29,35 @@ let $partitioning= ; 
if ($with_partitioning)

{

let $partitioning= PARTITION BY HASH(f_int1) PARTITIONS 2;

--disable_query_log

if ($with_directories)

{

eval SET @aux =

'PARTITION BY HASH(f_int1) PARTITIONS 2

let $partitioning= 

PARTITION BY HASH(f_int1) PARTITIONS 2

(PARTITION p1 

$index_directory,

PARTITION p2 

$index_directory)';

let $partitioning= `SELECT @aux`;

$index_directory);

}

}

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval CREATE TABLE t1 (

$column_list

$unique

)

$partitioning;

--enable_query_log

eval $insert_all;

--source suite/parts/inc/partition_check.inc

DROP TABLE t1;

--source suite/parts/inc/partition_check_drop.inc



#----------- PARTITION BY KEY

--disable_query_log

if ($with_partitioning)

{

eval SET @aux =

'PARTITION BY KEY(f_int1) PARTITIONS 5';

let $partitioning= `SELECT @aux`;

let $partitioning= PARTITION BY KEY(f_int1) PARTITIONS 5;

if ($with_directories)

{

--disable_query_log

eval SET @aux =

'PARTITION BY HASH(f_int1) PARTITIONS 5

let $partitioning= 

PARTITION BY HASH(f_int1) PARTITIONS 5

(PARTITION p1

$data_directory,

PARTITION p2
@@ -73,27 +67,25 @@ $data_directory 
$index_directory,

PARTITION p4,

PARTITION p5

$index_directory)';

let $partitioning= `SELECT @aux`;

$index_directory);

}

}

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval CREATE TABLE t1 (

$column_list

$unique

)

$partitioning;

--enable_query_log

eval $insert_all;

--source suite/parts/inc/partition_check.inc

DROP TABLE t1;

--source suite/parts/inc/partition_check_drop.inc



#----------- PARTITION BY LIST

--disable_query_log

if ($with_partitioning)

{

eval SET @aux =

'PARTITION BY LIST(MOD(f_int1,4))

let $partitioning= 

PARTITION BY LIST(MOD(f_int1,4))

(PARTITION part_3 VALUES IN (-3)

$index_directory,

 PARTITION part_2 VALUES IN (-2)
@@ -109,25 +101,23 @@ $index_directory, 
 PARTITION part2 VALUES IN (2)

$data_directory,

 PARTITION part3 VALUES IN (3)

$data_directory $index_directory)';

let $partitioning= `SELECT @aux`;

$data_directory $index_directory);

}

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval CREATE TABLE t1 (

$column_list

$unique

)

$partitioning;

--enable_query_log

eval $insert_all;

--source suite/parts/inc/partition_check.inc

DROP TABLE t1;

--source suite/parts/inc/partition_check_drop.inc



#----------- PARTITION BY RANGE

--disable_query_log

if ($with_partitioning)

{

eval SET @aux = 'PARTITION BY RANGE(f_int1)

let $partitioning= PARTITION BY RANGE(f_int1)

(PARTITION parta VALUES LESS THAN (0)

$index_directory,

PARTITION partb VALUES LESS THAN ($max_row_div4)
@@ -139,26 +129,24 @@ PARTITION partd VALUES LESS THAN ($max_row_div2 + $max_row_div4), 
PARTITION parte VALUES LESS THAN ($max_row)

$data_directory,

PARTITION partf VALUES LESS THAN $MAX_VALUE

$index_directory)';

let $partitioning= `SELECT @aux`;

$index_directory);

}

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval CREATE TABLE t1 (

$column_list

$unique

)

$partitioning;

--enable_query_log

eval $insert_all;

--source suite/parts/inc/partition_check.inc

DROP TABLE t1;

--source suite/parts/inc/partition_check_drop.inc



#----------- PARTITION BY RANGE -- SUBPARTITION BY HASH

--disable_query_log

if ($with_partitioning)

{

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)

$index_directory,

PARTITION partb VALUES LESS THAN ($max_row_div4)
@@ -166,25 +154,23 @@ $data_directory, 
PARTITION partc VALUES LESS THAN ($max_row_div2),

PARTITION partd VALUES LESS THAN $MAX_VALUE

$data_directory

$index_directory)';

let $partitioning= `SELECT @aux`;

$index_directory);

}

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval CREATE TABLE t1 (

$column_list

$unique

)

$partitioning;

--enable_query_log

eval $insert_all;

--source suite/parts/inc/partition_check.inc

DROP TABLE t1;

--source suite/parts/inc/partition_check_drop.inc



#----------- PARTITION BY RANGE -- SUBPARTITION BY KEY

--disable_query_log

if ($with_partitioning)

{

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)

$data_directory

(SUBPARTITION subpart11, SUBPARTITION subpart12),
@@ -196,26 +182,24 @@ $data_directory 
$index_directory

(SUBPARTITION subpart31, SUBPARTITION subpart32),

PARTITION part4 VALUES LESS THAN $MAX_VALUE

(SUBPARTITION subpart41, SUBPARTITION subpart42))';

let $partitioning= `SELECT @aux`;

(SUBPARTITION subpart41, SUBPARTITION subpart42));

}

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval CREATE TABLE t1 (

$column_list

$unique

)

$partitioning;

--enable_query_log

eval $insert_all;

--source suite/parts/inc/partition_check.inc

DROP TABLE t1;

--source suite/parts/inc/partition_check_drop.inc



#----------- PARTITION BY LIST -- SUBPARTITION BY HASH

--disable_query_log

if ($with_partitioning)

{

eval SET @aux =

'PARTITION BY LIST(ABS(MOD(f_int1,3))) SUBPARTITION BY HASH(f_int1 + 1)

let $partitioning= 

PARTITION BY LIST(ABS(MOD(f_int1,3))) SUBPARTITION BY HASH(f_int1 + 1)

(PARTITION part1 VALUES IN (0)

  $index_directory

  (SUBPARTITION sp11
@@ -239,15 +223,14 @@ eval SET @aux = 
     $index_directory,

   SUBPARTITION sp42

     $data_directory

     $index_directory))';

let $partitioning= `SELECT @aux`;

     $index_directory));

}

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

eval CREATE TABLE t1 (

$column_list

$unique

)

$partitioning;

--enable_query_log

eval $insert_all;

--source suite/parts/inc/partition_check.inc

DROP TABLE t1;