bk commit into 5.1 tree (kaa:1.2487) BUG#27643

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa 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, 2007-05-31 16:04:58+04:00, kaa@stripped +4 -0
  Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by
the patch for bug #27643.

  mysql-test/r/ctype_ucs2_def.result@stripped, 2007-05-31 16:04:55+04:00, kaa@stripped +1 -1
    Corrected the error messages for 5.1

  mysql-test/r/heap_hash.result@stripped, 2007-05-31 16:04:55+04:00, kaa@stripped +2 -2
    Corrected the error messages for 5.1

  mysql-test/t/ctype_ucs2_def.test@stripped, 2007-05-31 16:04:55+04:00, kaa@stripped +1 -1
    Corrected the error codes for 5.1.

  mysql-test/t/heap_hash.test@stripped, 2007-05-31 16:04:55+04:00, kaa@stripped +2 -2
    Corrected the error codes for 5.1.

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/bug27643/my51-bug27643

--- 1.22/mysql-test/r/heap_hash.result	2007-05-31 14:58:16 +04:00
+++ 1.23/mysql-test/r/heap_hash.result	2007-05-31 16:04:55 +04:00
@@ -372,13 +372,13 @@ col2 VARCHAR(32) CHARACTER SET utf8 COLL
 UNIQUE KEY key1 USING HASH (col1, col2)) ENGINE=MEMORY;
 INSERT INTO t1 VALUES('A', 'A');
 INSERT INTO t1 VALUES('A ', 'A ');
-ERROR 23000: Duplicate entry 'A -A ' for key 1
+ERROR 23000: Duplicate entry 'A -A ' for key 'key1'
 DROP TABLE t1;
 CREATE TABLE t1(col1 VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, 
 col2 VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, 
 UNIQUE KEY key1 USING HASH (col1, col2)) ENGINE=MEMORY;
 INSERT INTO t1 VALUES('A', 'A');
 INSERT INTO t1 VALUES('A ', 'A ');
-ERROR 23000: Duplicate entry 'A -A ' for key 1
+ERROR 23000: Duplicate entry 'A -A ' for key 'key1'
 DROP TABLE t1;
 End of 5.0 tests

--- 1.13/mysql-test/t/heap_hash.test	2007-05-31 14:58:16 +04:00
+++ 1.14/mysql-test/t/heap_hash.test	2007-05-31 16:04:55 +04:00
@@ -272,14 +272,14 @@ CREATE TABLE t1(col1 VARCHAR(32) CHARACT
                 col2 VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, 
                 UNIQUE KEY key1 USING HASH (col1, col2)) ENGINE=MEMORY;
 INSERT INTO t1 VALUES('A', 'A');
---error ER_DUP_ENTRY
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t1 VALUES('A ', 'A ');
 DROP TABLE t1;
 CREATE TABLE t1(col1 VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, 
                 col2 VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, 
                 UNIQUE KEY key1 USING HASH (col1, col2)) ENGINE=MEMORY;
 INSERT INTO t1 VALUES('A', 'A');
---error ER_DUP_ENTRY
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t1 VALUES('A ', 'A ');
 DROP TABLE t1;
 

--- 1.5/mysql-test/r/ctype_ucs2_def.result	2007-05-31 14:58:16 +04:00
+++ 1.6/mysql-test/r/ctype_ucs2_def.result	2007-05-31 16:04:55 +04:00
@@ -12,6 +12,6 @@ col2 VARCHAR(32) CHARACTER SET ucs2 COLL
 UNIQUE KEY key1 USING HASH (col1, col2)) ENGINE=MEMORY;
 INSERT INTO t1 VALUES('A', 'A'), ('B', 'B'), ('C', 'C');
 INSERT INTO t1 VALUES('A ', 'A ');
-ERROR 23000: Duplicate entry '' for key 1
+ERROR 23000: Duplicate entry '' for key 'key1'
 DROP TABLE t1;
 End of 5.0 tests

--- 1.6/mysql-test/t/ctype_ucs2_def.test	2007-05-31 14:58:16 +04:00
+++ 1.7/mysql-test/t/ctype_ucs2_def.test	2007-05-31 16:04:55 +04:00
@@ -25,7 +25,7 @@ CREATE TABLE t1(col1 VARCHAR(32) CHARACT
                 col2 VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL, 
                 UNIQUE KEY key1 USING HASH (col1, col2)) ENGINE=MEMORY;
 INSERT INTO t1 VALUES('A', 'A'), ('B', 'B'), ('C', 'C');
---error ER_DUP_ENTRY
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 INSERT INTO t1 VALUES('A ', 'A ');
 DROP TABLE t1;