database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-12 20:49:12 +03:00
Code Activity

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

Browse Source 
into  linux.site:/home/reggie/work/mysql-5.1
This commit is contained in:
reggie@linux.site
2006-02-22 14:18:45 -06:00
parent 5d07195888 6cea16a825
commit 3de74e6237
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/partition_mgm_err.result
View File

@@ -91,7 +91,7 @@ PARTITION BY KEY (a)
ALTER TABLE t1 ADD PARTITION PARTITIONS 0; ALTER TABLE t1 ADD PARTITION PARTITIONS 0;
ERROR HY000: At least one partition must be added ERROR HY000: At least one partition must be added
ALTER TABLE t1 ADD PARTITION PARTITIONS 1024; 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; ALTER TABLE t1 DROP PARTITION x0;
ERROR HY000: DROP PARTITION can only be used on RANGE/LIST partitions ERROR HY000: DROP PARTITION can only be used on RANGE/LIST partitions
ALTER TABLE t1 COALESCE PARTITION 1; ALTER TABLE t1 COALESCE PARTITION 1;

4
sql/share/errmsg.txt
View File

@@ -5660,8 +5660,8 @@ ER_PARTITION_NOT_DEFINED_ERROR
eng "For the partitioned engine it is necessary to define all %-.64s" eng "For the partitioned engine it is necessary to define all %-.64s"
swe "F<>r partitioneringsmotorn s<> <20>r det n<>dv<64>ndigt att definiera alla %-.64s" swe "F<>r partitioneringsmotorn s<> <20>r det n<>dv<64>ndigt att definiera alla %-.64s"
ER_TOO_MANY_PARTITIONS_ERROR ER_TOO_MANY_PARTITIONS_ERROR
eng "Too many partitions were defined" eng "Too many partitions (including subpartitions) were defined"
swe "F<>r m<>nga partitioner definierades" swe "F<>r m<>nga partitioner (inkluderande subpartitioner) definierades"
ER_SUBPARTITION_ERROR ER_SUBPARTITION_ERROR
eng "It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning" eng "It is only possible to mix RANGE/LIST partitioning with HASH/KEY partitioning for subpartitioning"
swe "Det <20>r endast m<>jligt att blanda RANGE/LIST partitionering med HASH/KEY partitionering f<>r subpartitionering" swe "Det <20>r endast m<>jligt att blanda RANGE/LIST partitionering med HASH/KEY partitionering f<>r subpartitionering"