From c99c44805c4104ad885e93a55b0986abfbb1e122 Mon Sep 17 00:00:00 2001
From: "lars@mysql.com" <>
Date: Thu, 24 Feb 2005 17:25:06 +0100
Subject: [PATCH] Fix of an incorrect merge

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

diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result
index 514ab60dafe..8482f631553 100644
--- a/mysql-test/r/rpl_insert_id.result
+++ b/mysql-test/r/rpl_insert_id.result
@@ -72,4 +72,4 @@ SET TIMESTAMP=1000000000;
 CREATE TABLE t1 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t1 VALUES (1),(1);
-Duplicate entry '1' for key 1
+ERROR 23000: Duplicate entry '1' for key 1