Commit 23f5d361 authored Sep 29, 2006 by unknown

After merge fix.

parent 70c6f7d2

mysql-test/r/merge.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));

mysql-test/t/merge.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;