From 0369042a0903ac4c0c07ec44f723b34e4f0821e1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 23 Jan 2006 12:17:05 +0100 Subject: WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX Change "duplicate key" message to print key name instead of key number. --- mysql-test/r/ndb_charset.result | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mysql-test/r/ndb_charset.result') diff --git a/mysql-test/r/ndb_charset.result b/mysql-test/r/ndb_charset.result index b1f8190f0ca..b3a2112d50b 100644 --- a/mysql-test/r/ndb_charset.result +++ b/mysql-test/r/ndb_charset.result @@ -27,9 +27,9 @@ a char(3) character set latin1 collate latin1_swedish_ci primary key ) engine=ndb; insert into t1 values('aAa'); insert into t1 values('aaa'); -ERROR 23000: Duplicate entry 'aaa' for key 1 +ERROR 23000: Duplicate entry 'aaa' for key 'PRIMARY' insert into t1 values('AAA'); -ERROR 23000: Duplicate entry 'AAA' for key 1 +ERROR 23000: Duplicate entry 'AAA' for key 'PRIMARY' select * from t1 order by a; a aAa @@ -51,9 +51,9 @@ a varchar(20) character set latin1 collate latin1_swedish_ci primary key ) engine=ndb; insert into t1 values ('A'),('b '),('C '),('d '),('E'),('f'); insert into t1 values('b'); -ERROR 23000: Duplicate entry 'b' for key 1 +ERROR 23000: Duplicate entry 'b' for key 'PRIMARY' insert into t1 values('a '); -ERROR 23000: Duplicate entry 'a ' for key 1 +ERROR 23000: Duplicate entry 'a ' for key 'PRIMARY' select a,length(a) from t1 order by a; a length(a) A 1 @@ -112,9 +112,9 @@ unique key(a) ) engine=ndb; insert into t1 values(1, 'aAa'); insert into t1 values(2, 'aaa'); -ERROR 23000: Duplicate entry '2' for key 1 +ERROR 23000: Duplicate entry '2' for key 'PRIMARY' insert into t1 values(3, 'AAA'); -ERROR 23000: Duplicate entry '3' for key 1 +ERROR 23000: Duplicate entry '3' for key 'PRIMARY' select * from t1 order by p; p a 1 aAa @@ -138,9 +138,9 @@ unique key(a) ) engine=ndb; insert into t1 values (1,'A'),(2,'b '),(3,'C '),(4,'d '),(5,'E'),(6,'f'); insert into t1 values(99,'b'); -ERROR 23000: Duplicate entry '99' for key 1 +ERROR 23000: Duplicate entry '99' for key 'PRIMARY' insert into t1 values(99,'a '); -ERROR 23000: Duplicate entry '99' for key 1 +ERROR 23000: Duplicate entry '99' for key 'PRIMARY' select a,length(a) from t1 order by a; a length(a) A 1 -- cgit v1.2.1