From 15d330ebcea124c429fe2b37d585d09852258ee4 Mon Sep 17 00:00:00 2001
From: "svoj@mysql.com/april.(none)" <>
Date: Fri, 29 Sep 2006 01:36:17 +0500
Subject: [PATCH] After merge fix.

---
 mysql-test/r/merge.result | 2 +-
 mysql-test/t/merge.test   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index b08b985983d..f9c2f111734 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -277,7 +277,7 @@ t3	CREATE TABLE `t3` (
 drop table t3,t2,t1;
 create table t1 (a int not null, key(a)) engine=merge;
 select * from t1;
-a
+ERROR HY000: Got error 124 from storage engine
 drop table t1;
 create table t1 (a int not null, b int not null, key(a,b));
 create table t2 (a int not null, b int not null, key(a,b));
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 4006fa27fe3..5498468d902 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -124,6 +124,7 @@ drop table t3,t2,t1;
 # Test table without unions
 #
 create table t1 (a int not null, key(a)) engine=merge;
+--error 1030
 select * from t1;
 drop table t1;