After-merge fix.

bf2f3680 · Ramil Kalimullin · bef0ee99 · bf2f3680
Commit bf2f3680 authored Sep 05, 2008 by Ramil Kalimullin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/r/create.result mysql-test/r/create.result +2 -2

No files found.
--- 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);