database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#36001: Partitions: spelling and using some error messages

Browse Source 
Backport from 6.0

Changed error message to show that it is partitioning
that does not support foreign keys yet.

Changed spelling from British english to American english.
This commit is contained in:
Mattias Jonsson
2009-02-18 21:10:19 +01:00
parent ad0e657db4
commit d8e34e554c
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/partition.result
View File

@ -1,5 +1,9 @@
SET @old_general_log= @@global.general_log;
drop table if exists t1, t2;
CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
ENGINE=MyISAM
PARTITION BY HASH (a);
ERROR HY000: Foreign key clause is not yet supported in conjunction with partitioning
CREATE TABLE t1 (
pk INT NOT NULL AUTO_INCREMENT,
PRIMARY KEY (pk)

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

@ -25,13 +25,13 @@ ALTER TABLE t1 DROP PARTITION x10, x1, x2, x3;
ERROR HY000: Error in list of partitions to DROP
ALTER TABLE t1 REORGANIZE PARTITION x0,x1,x2,x3,x4,x5,x6,x7,x8,x9,x10 INTO
(PARTITION x11 VALUES LESS THAN (22));
ERROR HY000: More partitions to reorganise than there are partitions
ERROR HY000: More partitions to reorganize than there are partitions
ALTER TABLE t1 REORGANIZE PARTITION x0,x1,x2 INTO
(PARTITION x3 VALUES LESS THAN (6));
ERROR HY000: Duplicate partition name x3
ALTER TABLE t1 REORGANIZE PARTITION x0, x2 INTO
(PARTITION x11 VALUES LESS THAN (2));
ERROR HY000: When reorganising a set of partitions they must be in consecutive order
ERROR HY000: When reorganizing a set of partitions they must be in consecutive order
ALTER TABLE t1 REORGANIZE PARTITION x0, x1, x1 INTO
(PARTITION x11 VALUES LESS THAN (4));
ERROR HY000: Error in list of partitions to REORGANIZE

8
mysql-test/t/partition.test
View File

@ -16,6 +16,14 @@ SET @old_general_log= @@global.general_log;
drop table if exists t1, t2;
--enable_warnings
#
# Bug#36001: Partitions: spelling and using some error messages
#
--error ER_FOREIGN_KEY_ON_PARTITIONED
CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
ENGINE=MyISAM
PARTITION BY HASH (a);
#
# Bug#40954: Crash if range search and order by.
#

16
sql/share/errmsg.txt
View File

@ -5775,9 +5775,9 @@ ER_PARTITION_MGMT_ON_NONPARTITIONED
ger "Partitionsverwaltung einer nicht partitionierten Tabelle ist nicht m<>glich"
swe "Partitioneringskommando p<> en opartitionerad tabell <20>r inte m<>jligt"
ER_FOREIGN_KEY_ON_PARTITIONED
eng "Foreign key condition is not yet supported in conjunction with partitioning"
eng "Foreign key clause is not yet supported in conjunction with partitioning"
ger "Fremdschl<68>ssel-Beschr<68>nkungen sind im Zusammenhang mit Partitionierung nicht zul<75>ssig"
swe "Foreign key villkor <20>r inte <20>nnu implementerad i kombination med partitionering"
swe "Foreign key klausul <20>r inte <20>nnu implementerad i kombination med partitionering"
ER_DROP_PARTITION_NON_EXISTENT
eng "Error in list of partitions to %-.64s"
ger "Fehler in der Partitionsliste bei %-.64s"
@ -5791,13 +5791,13 @@ ER_COALESCE_ONLY_ON_HASH_PARTITION
ger "COALESCE PARTITION kann nur auf HASH- oder KEY-Partitionen benutzt werden"
swe "COALESCE PARTITION kan bara anv<6E>ndas p<> HASH/KEY partitioner"
ER_REORG_HASH_ONLY_ON_SAME_NO
eng "REORGANISE PARTITION can only be used to reorganise partitions not to change their numbers"
eng "REORGANIZE PARTITION can only be used to reorganize partitions not to change their numbers"
ger "REORGANIZE PARTITION kann nur zur Reorganisation von Partitionen verwendet werden, nicht, um ihre Nummern zu <20>ndern"
swe "REORGANISE PARTITION kan bara anv<6E>ndas f<>r att omorganisera partitioner, inte f<>r att <20>ndra deras antal"
swe "REORGANIZE PARTITION kan bara anv<6E>ndas f<>r att omorganisera partitioner, inte f<>r att <20>ndra deras antal"
ER_REORG_NO_PARAM_ERROR
eng "REORGANISE PARTITION without parameters can only be used on auto-partitioned tables using HASH PARTITIONs"
eng "REORGANIZE PARTITION without parameters can only be used on auto-partitioned tables using HASH PARTITIONs"
ger "REORGANIZE PARTITION ohne Parameter kann nur f<>r auto-partitionierte Tabellen verwendet werden, die HASH-Partitionierung benutzen"
swe "REORGANISE PARTITION utan parametrar kan bara anv<6E>ndas p<> auto-partitionerade tabeller som anv<6E>nder HASH partitionering"
swe "REORGANIZE PARTITION utan parametrar kan bara anv<6E>ndas p<> auto-partitionerade tabeller som anv<6E>nder HASH partitionering"
ER_ONLY_ON_RANGE_LIST_PARTITION
eng "%-.64s PARTITION can only be used on RANGE/LIST partitions"
ger "%-.64s PARTITION kann nur f<>r RANGE- oder LIST-Partitionen verwendet werden"
@ -5815,7 +5815,7 @@ ER_COALESCE_PARTITION_NO_PARTITION
ger "Zumindest eine Partition muss mit COALESCE PARTITION zusammengef<65>gt werden"
swe "<22>tminstone en partition m<>ste sl<73>s ihop vid COALESCE PARTITION"
ER_REORG_PARTITION_NOT_EXIST
eng "More partitions to reorganise than there are partitions"
eng "More partitions to reorganize than there are partitions"
ger "Es wurde versucht, mehr Partitionen als vorhanden zu reorganisieren"
swe "Fler partitioner att reorganisera <20>n det finns partitioner"
ER_SAME_NAME_PARTITION
@ -5827,7 +5827,7 @@ ER_NO_BINLOG_ERROR
ger "Es es nicht erlaubt, bei diesem Befehl binlog abzuschalten"
swe "Det <20>r inte till<6C>tet att st<73>nga av binlog p<> detta kommando"
ER_CONSECUTIVE_REORG_PARTITIONS
eng "When reorganising a set of partitions they must be in consecutive order"
eng "When reorganizing a set of partitions they must be in consecutive order"
ger "Bei der Reorganisation eines Satzes von Partitionen m<>ssen diese in geordneter Reihenfolge vorliegen"
swe "N<>r ett antal partitioner omorganiseras m<>ste de vara i konsekutiv ordning"
ER_REORG_OUTSIDE_RANGE

2
sql/sql_table.cc
View File

@ -3321,7 +3321,7 @@ bool mysql_create_table_no_lock(THD *thd,
if (key->type == Key::FOREIGN_KEY &&
!part_info->is_auto_partitioned)
{
my_error(ER_CANNOT_ADD_FOREIGN, MYF(0));
my_error(ER_FOREIGN_KEY_ON_PARTITIONED, MYF(0));
goto err;
}
}