diff options
| author | unknown <reggie@linux.site> | 2006-02-22 14:18:45 -0600 |
|---|---|---|
| committer | unknown <reggie@linux.site> | 2006-02-22 14:18:45 -0600 |
| commit | 5e02bec9ceefe1889db8b0dfc04e90d0b34a690f (patch) | |
| tree | ba6289deeb8dbbc9a98c3c3e5eff39965baa500c | |
| parent | 37afbdc0b046781fde88a6ed409dc7060e78578b (diff) | |
| parent | ef5d68f33927d5e4bbb4bac29797601e9c9b6f20 (diff) | |
| download | mariadb-git-5e02bec9ceefe1889db8b0dfc04e90d0b34a690f.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/partition_mgm_err.result | 2 | ||||
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/partition_mgm_err.result b/mysql-test/r/partition_mgm_err.result index 7d4af16580c..1b73bfb9f16 100644 --- a/mysql-test/r/partition_mgm_err.result +++ b/mysql-test/r/partition_mgm_err.result @@ -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; diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index b2eb347db71..e1bea5009ff 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5660,8 +5660,8 @@ ER_PARTITION_NOT_DEFINED_ERROR eng "For the partitioned engine it is necessary to define all %-.64s" swe "För partitioneringsmotorn så är det nödvändigt att definiera alla %-.64s" ER_TOO_MANY_PARTITIONS_ERROR - eng "Too many partitions were defined" - swe "För många partitioner definierades" + eng "Too many partitions (including subpartitions) were defined" + swe "För många 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 möjligt att blanda RANGE/LIST partitionering med HASH/KEY partitionering för subpartitionering" |