Commit 5297d9c1 authored by unknown's avatar unknown
Browse files

manual merge

parent 42c3fa73

mysql-test/r/partition.result

+4 −4
Original line number Diff line number Diff line
@@ -1083,12 +1083,12 @@ partition by range (a) 
subpartition by hash (a)

(partition p0 VALUES LESS THAN (1) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'

(SUBPARTITION subpart00, SUBPARTITION subpart01));

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

hello/master-data/test/t1#P#p0#SP#subpart00.MYD

hello/master-data/test/t1#P#p0#SP#subpart00.MYI

hello/master-data/test/t1#P#p0#SP#subpart01.MYD

hello/master-data/test/t1#P#p0#SP#subpart01.MYI

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

hello/master-data/tmpdata/t1#P#p0#SP#subpart00.MYD

hello/master-data/tmpdata/t1#P#p0#SP#subpart01.MYD

hello/master-data/tmpinx/t1#P#p0#SP#subpart00.MYI
@@ -1098,6 +1098,8 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO 
(SUBPARTITION subpart10, SUBPARTITION subpart11),

partition p2 VALUES LESS THAN (2) DATA DIRECTORY = 'hello/master-data/tmpdata' INDEX DIRECTORY = 'hello/master-data/tmpinx'

(SUBPARTITION subpart20, SUBPARTITION subpart21));

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

hello/master-data/test/t1#P#p1#SP#subpart10.MYD

hello/master-data/test/t1#P#p1#SP#subpart10.MYI

hello/master-data/test/t1#P#p1#SP#subpart11.MYD
@@ -1106,8 +1108,6 @@ hello/master-data/test/t1#P#p2#SP#subpart20.MYD 
hello/master-data/test/t1#P#p2#SP#subpart20.MYI

hello/master-data/test/t1#P#p2#SP#subpart21.MYD

hello/master-data/test/t1#P#p2#SP#subpart21.MYI

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

hello/master-data/tmpdata/t1#P#p1#SP#subpart10.MYD

hello/master-data/tmpdata/t1#P#p1#SP#subpart11.MYD

hello/master-data/tmpdata/t1#P#p2#SP#subpart20.MYD

mysql-test/r/partition_mgm.result

+4 −4
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ t1 CREATE TABLE `t1` ( 
  `f_date` date DEFAULT NULL,

  `f_varchar` varchar(30) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2  */

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

hello/master-data/test/t1#P#p0.MYD

hello/master-data/test/t1#P#p0.MYI

hello/master-data/test/t1#P#p1.MYD

hello/master-data/test/t1#P#p1.MYI

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

ALTER TABLE t1 COALESCE PARTITION 1;

SHOW CREATE TABLE t1;

Table	Create Table
@@ -20,10 +20,10 @@ t1 CREATE TABLE `t1` ( 
  `f_date` date DEFAULT NULL,

  `f_varchar` varchar(30) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 1  */

hello/master-data/test/t1#P#p0.MYD

hello/master-data/test/t1#P#p0.MYI

hello/master-data/test/t1.frm

hello/master-data/test/t1.par

hello/master-data/test/t1#P#p0.MYD

hello/master-data/test/t1#P#p0.MYI

drop table t1;

create table t1 (a int)

partition by list (a)