diff options
author | unknown <kaa@polly.local> | 2007-05-31 16:04:58 +0400 |
---|---|---|
committer | unknown <kaa@polly.local> | 2007-05-31 16:04:58 +0400 |
commit | d51f0e05038e1127bf4e5c9b9e10f0bf04b52bcb (patch) | |
tree | e714494db66e351ab8ead57db21f67553ea5cc30 /mysql-test/r/heap_hash.result | |
parent | d92bc733f8554dfe815cc0ceec5bbe1600453507 (diff) | |
download | mariadb-git-d51f0e05038e1127bf4e5c9b9e10f0bf04b52bcb.tar.gz |
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:
Corrected the error messages for 5.1
mysql-test/r/heap_hash.result:
Corrected the error messages for 5.1
mysql-test/t/ctype_ucs2_def.test:
Corrected the error codes for 5.1.
mysql-test/t/heap_hash.test:
Corrected the error codes for 5.1.
Diffstat (limited to 'mysql-test/r/heap_hash.result')
-rw-r--r-- | mysql-test/r/heap_hash.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/heap_hash.result b/mysql-test/r/heap_hash.result index c7a620002c4..bae49af462f 100644 --- a/mysql-test/r/heap_hash.result +++ b/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 |