From fb338e6c4049c3993cbf59c90e9757767b19c47c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 31 Aug 2006 13:43:26 +0500 Subject: [PATCH] Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..." fixed error message mysql-test/r/ndb_partition_key.result: Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..." result fix mysql-test/r/partition.result: Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..." result fix --- mysql-test/r/ndb_partition_key.result | 2 +- mysql-test/r/partition.result | 2 +- sql/share/errmsg.txt | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mysql-test/r/ndb_partition_key.result b/mysql-test/r/ndb_partition_key.result index e478c23ec00..7e480f68dd9 100644 --- a/mysql-test/r/ndb_partition_key.result +++ b/mysql-test/r/ndb_partition_key.result @@ -17,7 +17,7 @@ drop table t1; CREATE TABLE t1 (a int, b int, c int, d int, PRIMARY KEY(a,b)) ENGINE = NDB PARTITION BY KEY (c); -ERROR HY000: A PRIMARY KEY need to include all fields in the partition function +ERROR HY000: A PRIMARY KEY must include all columns in the table's partitioning function CREATE TABLE t1 (a int, b int, c int, PRIMARY KEY(a,b)) ENGINE = NDB PARTITION BY KEY (a); diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result index e95489864f7..2d383ef7696 100644 --- a/mysql-test/r/partition.result +++ b/mysql-test/r/partition.result @@ -731,7 +731,7 @@ ERROR HY000: Cannot create temporary table with partitions create table t1 (a int, b int) partition by list (a) (partition p1 values in (1), partition p2 values in (2)); alter table t1 add primary key (b); -ERROR HY000: A PRIMARY KEY need to include all fields in the partition function +ERROR HY000: A PRIMARY KEY must include all columns in the table's partitioning function show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 297e4c5c374..66247eb62a6 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5702,9 +5702,7 @@ ER_BLOB_FIELD_IN_PART_FUNC_ERROR ger "In der Partitionierungsfunktion sind BLOB-Spalten nicht erlaubt" swe "Ett BLOB-fält är inte tillåtet i partitioneringsfunktioner" ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF - eng "A %-.64s need to include all fields in the partition function" - ger "Ein %-.64s muss alle Spalten der Partitionierungsfunktion umfassen" - swe "En %-.64s behöver inkludera alla fält i partitioneringsfunktionen för denna lagringsmotor" + eng "A %-.64s must include all columns in the table's partitioning function" ER_NO_PARTS_ERROR eng "Number of %-.64s = 0 is not an allowed value" ger "Eine Anzahl von %-.64s = 0 ist kein erlaubter Wert"