After merge fix.

mysql-test/r/merge.result

@@ -768,6 +768,15 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 test.t2	check	status	OK
 drop table t1, t2, t3;
+CREATE TABLE t1(a INT) ENGINE=MEMORY;
+CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1);
+SELECT * FROM t2;
+ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists
+DROP TABLE t1, t2;
+CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);
+SELECT * FROM t2;
+ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists
+DROP TABLE t2;
 create table t1 (b bit(1));
 create table t2 (b bit(1));
 create table tm (b bit(1)) engine = merge union = (t1,t2);
@@ -785,13 +794,4 @@ insert into t1 values (1);
 ERROR HY000: Table 't1' is read only
 drop table t2;
 drop table t1;
-CREATE TABLE t1(a INT) ENGINE=MEMORY;
-CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1);
-SELECT * FROM t2;
-ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists
-DROP TABLE t1, t2;
-CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);
-SELECT * FROM t2;
-ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists
-DROP TABLE t2;
 End of 5.0 tests

sql/share/errmsg.txt

@@ -3813,7 +3813,7 @@ ER_WRONG_MRG_TABLE
 	cze "V-Bechny tabulky v MERGE tabulce nejsou definovny stejn"
 	dan "Tabellerne i MERGE er ikke defineret ens"
 	nla "Niet alle tabellen in de MERGE tabel hebben identieke gedefinities"
-	eng "All tables in the MERGE table are not identically defined"
+	eng "Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exists"
 	est "Kik tabelid MERGE tabeli mratluses ei ole identsed"
 	fre "Toutes les tables de la table de type MERGE n'ont pas la mme dfinition"
 	ger "Nicht alle Tabellen in der MERGE-Tabelle sind gleich definiert"