bk commit into 5.1 tree (tsmith:1.2263)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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, 2006-08-03 19:43:52+02:00, tsmith@stripped +1 -0
  Manual merge resolve, part 6 of 6+

  mysql-test/r/warnings.result@stripped, 2006-08-03 19:43:40+02:00, tsmith@stripped +0 -7
    Manual merge resolve, part 6 of 6+

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	maint1.mysql.com
# Root:	/data/localhome/tsmith/bk/mrg51-c

--- 1.42/mysql-test/r/warnings.result	2006-08-03 19:43:30 +02:00
+++ 1.43/mysql-test/r/warnings.result	2006-08-03 19:43:30 +02:00
@@ -173,13 +173,6 @@
 Warnings:
 Warning	1266	Using storage engine MyISAM for table 't1'
 drop table t1;
-create table t1 (id int) type=heap;
-Warnings:
-Warning	1287	'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
-alter table t1 type=myisam;
-Warnings:
-Warning	1287	'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
-drop table t1;
 set table_type=MYISAM;
 Warnings:
 Warning	1541	The syntax 'table_type' is deprecated and will be removed in MySQL 5.2. Please use 'storage_engine' instead.