Commit 2ecd916d authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307
parents 4b639b6c 6e53baeb

mysql-test/r/partition.result

+5 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (a int)

engine = csv

partition by list (a)

(partition p0 values in (null));

ERROR HY000: CSV handler cannot be used in partitioned tables

create table t1 (a int)

partition by key(a)

(partition p0 engine = MEMORY);

drop table t1;

mysql-test/r/partition_mgm.result

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

  `f_varchar` varchar(30) DEFAULT NULL

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

/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYD

/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYI

/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p1.MYD

/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p1.MYI

/home/pappa/bug19305/mysql-test/var/master-data/test/t1.frm

/home/pappa/bug19305/mysql-test/var/master-data/test/t1.par

ALTER TABLE t1 COALESCE PARTITION 1;

SHOW CREATE TABLE t1;

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

  `f_varchar` varchar(30) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 1 
/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYD

/home/pappa/bug19305/mysql-test/var/master-data/test/t1#P#p0.MYI

/home/pappa/bug19305/mysql-test/var/master-data/test/t1.frm

/home/pappa/bug19305/mysql-test/var/master-data/test/t1.par

mysql-test/t/partition.test

+11 −0
Original line number Diff line number Diff line
@@ -9,6 +9,17 @@ 
drop table if exists t1;

--enable_warnings



#

# Bug 19307: CSV engine crashes

#

--error ER_PARTITION_MERGE_ERROR

create table t1 (a int)

engine = csv

partition by list (a)

(partition p0 values in (null));



#

#

create table t1 (a int)

partition by key(a)

(partition p0 engine = MEMORY);

mysql-test/t/partition_mgm.test

+2 −2
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ CREATE TABLE t1 (f_date DATE, f_varchar VARCHAR(30)) 
PARTITION BY HASH(CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2;

SHOW CREATE TABLE t1;



--exec ls $MYSQLTEST_VARDIR/master-data/test/t1*

#--exec ls $MYSQLTEST_VARDIR/master-data/test/t1*

ALTER TABLE t1 COALESCE PARTITION 1;

SHOW CREATE TABLE t1;

--exec ls $MYSQLTEST_VARDIR/master-data/test/t1*

#--exec ls $MYSQLTEST_VARDIR/master-data/test/t1*

sql/partition_info.cc

+4 −2
Original line number Diff line number Diff line
@@ -442,9 +442,11 @@ bool partition_info::check_engine_mix(handlerton **engine_array, uint no_parts) 
      DBUG_RETURN(TRUE);

    }

  } while (++i < no_parts);

  if (engine_array[0] == &myisammrg_hton)

  if (engine_array[0] == &myisammrg_hton ||

      engine_array[0] == &tina_hton)

  {

    my_error(ER_PARTITION_MERGE_ERROR, MYF(0));

    my_error(ER_PARTITION_MERGE_ERROR, MYF(0),

    engine_array[0] == &myisammrg_hton ? "MyISAM Merge" : "CSV");

    DBUG_RETURN(TRUE);

  }

  DBUG_RETURN(FALSE);