summaryrefslogtreecommitdiff
path: root/mysql-test/r/create.result
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2008-09-05 14:06:24 +0500
committerRamil Kalimullin <ramil@mysql.com>2008-09-05 14:06:24 +0500
commitb7a276f7ffe4f28f48f7f3ddc74ebcc63f971f26 (patch)
treeb15883073880e9986eac77064ef51bad68a2daa4 /mysql-test/r/create.result
parent00d7c50e48576b6b3f1b9386523989661845d623 (diff)
downloadmariadb-git-b7a276f7ffe4f28f48f7f3ddc74ebcc63f971f26.tar.gz
After-merge fix.
Diffstat (limited to 'mysql-test/r/create.result')
-rw-r--r--mysql-test/r/create.result4
1 files changed, 2 insertions, 2 deletions
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);