Fixed 5.0 -> 5.1 merge

This commit is contained in:
unknown 2007-08-20 17:50:42 -06:00
parent 8d201090f4
commit 5f40dafcd3
2 changed files with 8 additions and 1 deletions

View file

@ -471,7 +471,7 @@ drop table if exists t1;
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings
create table t1 (a int) ENGINE=MEMORY; eval create table t1 (a int) ENGINE=$other_engine_type;
--echo --> client 2 --echo --> client 2
connection con2; connection con2;
--error 1031 --error 1031

View file

@ -515,3 +515,10 @@ ERROR 42S02: Table 'test.t1' doesn't exist
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 't1'
drop table if exists t1;
create table t1 (a int) ENGINE=MEMORY;
--> client 2
handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option
--> client 1
drop table t1;