From 23145cfed72954c29f5a47e82af22898164be4b0 Mon Sep 17 00:00:00 2001
From: "monty@narttu.mysql.fi" <>
Date: Wed, 4 Jun 2003 18:28:51 +0300
Subject: Added SQLSTATE to client/server protocol bmove_allign -> bmove_align
 Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a
 .sql data file Added new (MEMROOT*) functions to avoid calling current_thd()
 when creating some common objects. Added table_alias_charset, for easier
 --lower-case-table-name handling Better SQL_MODE handling (Setting complex
 options also sets sub options) New (faster) assembler string functions for
 x86

---
 mysql-test/r/key.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mysql-test/r/key.result')

diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result
index 5060fbff5e8..e0b2b84ac16 100644
--- a/mysql-test/r/key.result
+++ b/mysql-test/r/key.result
@@ -127,7 +127,7 @@ primary key (SEQNO, MOTYPEID, MOINSTANCEID, ATTRID, VALUE )
 INSERT INTO t1 VALUES (1, 1, 1, 1, 'a');
 INSERT INTO t1 VALUES (1, 1, 1, 1, 'b');
 INSERT INTO t1 VALUES (1, 1, 1, 1, 'a');
-Duplicate entry '1-1-1-1-a' for key 1
+ERROR 23000: Duplicate entry '1-1-1-1-a' for key 1
 drop table t1;
 CREATE TABLE t1 (
 a tinytext NOT NULL,
-- 
cgit v1.2.1