Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

mysql-test/r/ctype_ucs2_def.result

@@ -12,6 +12,6 @@ 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');
 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

mysql-test/r/heap_hash.result

@@ -372,13 +372,13 @@ 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');
 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

mysql-test/t/ctype_ucs2_def.test

@@ -25,7 +25,7 @@ CREATE TABLE t1(col1 VARCHAR(32) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL,
                 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;
 

mysql-test/t/heap_hash.test

@@ -272,14 +272,14 @@ CREATE TABLE t1(col1 VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
                 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;