bk commit into 5.1 tree (malff:1.2567)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-20 17:50:42-06:00, malff@weblab.(none) +2 -0
  Fixed 5.0 -> 5.1 merge

  mysql-test/include/handler.inc@stripped, 2007-08-20 17:50:39-06:00, malff@weblab.(none) +1
-1
    Fixed 5.0 -> 5.1 merge

  mysql-test/r/handler_innodb.result@stripped, 2007-08-20 17:50:39-06:00, malff@weblab.(none)
+7 -0
    Fixed 5.0 -> 5.1 merge

diff -Nrup a/mysql-test/include/handler.inc b/mysql-test/include/handler.inc
--- a/mysql-test/include/handler.inc	2007-08-20 16:11:42 -06:00
+++ b/mysql-test/include/handler.inc	2007-08-20 17:50:39 -06:00
@@ -471,7 +471,7 @@ drop table if exists t1;
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
-create table t1 (a int) ENGINE=MEMORY;
+eval create table t1 (a int) ENGINE=$other_engine_type;
 --echo --> client 2
 connection con2;
 --error 1031
diff -Nrup a/mysql-test/r/handler_innodb.result b/mysql-test/r/handler_innodb.result
--- a/mysql-test/r/handler_innodb.result	2006-10-04 15:48:21 -06:00
+++ b/mysql-test/r/handler_innodb.result	2007-08-20 17:50:39 -06:00
@@ -515,3 +515,10 @@ ERROR 42S02: Table 'test.t1' doesn't exi
 drop table if exists t1;
 Warnings:
 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;