Commit 5e02bec9 authored by unknown's avatar unknown
Browse files

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

into  linux.site:/home/reggie/work/mysql-5.1


sql/share/errmsg.txt:
  Auto merged
parents 37afbdc0 ef5d68f3

mysql-test/r/partition_mgm_err.result

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ PARTITION BY KEY (a) 
ALTER TABLE t1 ADD PARTITION PARTITIONS 0;

ERROR HY000: At least one partition must be added

ALTER TABLE t1 ADD PARTITION PARTITIONS 1024;

ERROR HY000: Too many partitions were defined

ERROR HY000: Too many partitions (including subpartitions) were defined

ALTER TABLE t1 DROP PARTITION x0;

ERROR HY000: DROP PARTITION can only be used on RANGE/LIST partitions

ALTER TABLE t1 COALESCE PARTITION 1;

sql/share/errmsg.txt

+2 −2
Original line number Diff line number Diff line
@@ -5660,8 +5660,8 @@ ER_PARTITION_NOT_DEFINED_ERROR 
        eng "For the partitioned engine it is necessary to define all %-.64s"

        swe "Fr partitioneringsmotorn s r det ndvndigt att definiera alla %-.64s"

ER_TOO_MANY_PARTITIONS_ERROR

        eng "Too many partitions were defined"

        swe "Fr mnga partitioner definierades"

        eng "Too many partitions (including subpartitions) were defined"

        swe "Fr mnga partitioner (inkluderande subpartitioner) definierades"

ER_SUBPARTITION_ERROR

        eng "It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning"

        swe "Det r endast mjligt att blanda RANGE/LIST partitionering med HASH/KEY partitionering fr subpartitionering"