From b7a276f7ffe4f28f48f7f3ddc74ebcc63f971f26 Mon Sep 17 00:00:00 2001 From: Ramil Kalimullin Date: Fri, 5 Sep 2008 14:06:24 +0500 Subject: After-merge fix. --- mysql-test/r/create.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/r/create.result') diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 1ff4c14c6d1..b8723a87661 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1565,10 +1565,10 @@ CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY) SELECT a FROM t1; CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY) SELECT a FROM t1; -ERROR 23000: Duplicate entry '1' for key 1 +ERROR 23000: Duplicate entry '1' for key 'PRIMARY' CREATE TABLE IF NOT EXISTS t2 (a INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY) SELECT a FROM t1; -ERROR 23000: Duplicate entry '1' for key 1 +ERROR 23000: Duplicate entry '1' for key 'PRIMARY' DROP TABLE t1, t2; End of 5.0 tests CREATE TABLE t1 (a int, b int); -- cgit v1.2.1