From: Date: August 31 2006 10:43am
Subject: bk commit into 5.1 tree (gluh:1.2288) BUG#21862
List-Archive: http://lists.mysql.com/commits/11144
X-Bug: 21862
Message-Id: <20060831084339.55F822A0AEB@gluh.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-31 13:43:26+05:00, gluh@stripped +3 -0
  Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
  fixed error message

  mysql-test/r/ndb_partition_key.result@stripped, 2006-08-31 13:43:20+05:00, gluh@stripped +1 -1
    Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
    result fix

  mysql-test/r/partition.result@stripped, 2006-08-31 13:43:21+05:00, gluh@stripped +1 -1
    Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
    result fix

  sql/share/errmsg.txt@stripped, 2006-08-31 13:43:21+05:00, gluh@stripped +1 -3
    Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..."
    fixed error message

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	gluh.(none)
# Root:	/home/gluh/MySQL/Merge/5.1-kt

--- 1.119/sql/share/errmsg.txt	2006-08-31 13:43:39 +05:00
+++ 1.120/sql/share/errmsg.txt	2006-08-31 13:43:39 +05:00
@@ -5702,9 +5702,7 @@
         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"

--- 1.3/mysql-test/r/ndb_partition_key.result	2006-08-31 13:43:39 +05:00
+++ 1.4/mysql-test/r/ndb_partition_key.result	2006-08-31 13:43:39 +05:00
@@ -17,7 +17,7 @@
 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);

--- 1.49/mysql-test/r/partition.result	2006-08-31 13:43:39 +05:00
+++ 1.50/mysql-test/r/partition.result	2006-08-31 13:43:39 +05:00
@@ -731,7 +731,7 @@
 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` (