Commit ed55bc9e authored by unknown's avatar unknown
Browse files

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

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304


sql/partition_info.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/share/errmsg.txt:
  manual merge
parents a04d9fa9 301c7e07

mysql-test/r/partition.result

+4 −0
Original line number Diff line number Diff line
@@ -890,6 +890,10 @@ s1 
2

3

drop table t1;

create table t1 (a int)

partition by key (a)

(partition p0 engine = MERGE);

ERROR HY000: MyISAM Merge handler cannot be used in partitioned tables

create table t1 (a int) engine=memory

partition by key(a);

insert into t1 values (1);

mysql-test/t/partition.test

+8 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,14 @@ insert into t1 values (1); 
create index inx1 on t1(a);

drop table t1;



#

# BUG 19304 Partitions: MERGE handler not allowed in partitioned tables

#

--error ER_PARTITION_MERGE_ERROR

create table t1 (a int)

partition by key (a)

(partition p0 engine = MERGE);



#

# BUG 19062 Partition clause ignored if CREATE TABLE ... AS SELECT ...;

#

sql/partition_info.cc

+8 −7
Original line number Diff line number Diff line
@@ -432,18 +432,22 @@ char *partition_info::has_unique_names() 
bool partition_info::check_engine_mix(handlerton **engine_array, uint no_parts)

{

  uint i= 0;

  bool result= FALSE;

  DBUG_ENTER("partition_info::check_engine_mix");



  do

  {

    if (engine_array[i] != engine_array[0])

    {

      result= TRUE;

      break;

      my_error(ER_MIX_HANDLER_ERROR, MYF(0));

      DBUG_RETURN(TRUE);

    }

  } while (++i < no_parts);

  DBUG_RETURN(result);

  if (ha_legacy_type(engine_array[0]) == DB_TYPE_MRG_MYISAM)

  {

    my_error(ER_PARTITION_MERGE_ERROR, MYF(0));

    DBUG_RETURN(TRUE);

  }

  DBUG_RETURN(FALSE);

}
@@ -757,10 +761,7 @@ bool partition_info::check_partition_info(handlerton **eng_type, 
    } while (++i < no_parts);

  }

  if (unlikely(partition_info::check_engine_mix(engine_array, part_count)))

  {

    my_error(ER_MIX_HANDLER_ERROR, MYF(0));

    goto end;

  }



  if (eng_type)

    *eng_type= (handlerton*)engine_array[0];

sql/share/errmsg.txt

+3 −0
Original line number Diff line number Diff line
@@ -5846,3 +5846,6 @@ ER_EVENT_MODIFY_QUEUE_ERROR 
        eng "Internal scheduler error %d"

ER_EVENT_SET_VAR_ERROR

        eng "Error during starting/stopping of the scheduler. Error code %u"

ER_PARTITION_MERGE_ERROR

        eng "MyISAM Merge handler cannot be used in partitioned tables"

        swe "MyISAM Merge kan inte anndas i en partitionerad tabell"