From eeaa7f6638033c59b322876b2ac8a7cd57267808 Mon Sep 17 00:00:00 2001
From: "kroki/tomash@moonlight.intranet" <>
Date: Wed, 25 Oct 2006 20:12:23 +0400
Subject: [PATCH] After merge fix.

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

diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
index c8c73a3a14a..efd200354e6 100644
--- a/mysql-test/r/innodb_mysql.result
+++ b/mysql-test/r/innodb_mysql.result
@@ -258,7 +258,7 @@ INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1);
 DELETE IGNORE FROM t1 WHERE i = 1;
 Warnings:
-Error	1451	Cannot delete or update a parent row: a foreign key constraint fails (`test/t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`i`) REFERENCES `t1` (`i`) ON DELETE NO ACTION)
+Error	1451	Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`i`) REFERENCES `t1` (`i`) ON DELETE NO ACTION)
 SELECT * FROM t1, t2;
 i	i
 1	1