From a4f66037482db4865fbc6b1bdee7969037b2fc43 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Aug 2006 19:43:52 +0200 Subject: [PATCH] Manual merge resolve, part 6 of 6+ --- mysql-test/r/warnings.result | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 78948e47562..317b4c6bccb 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -173,13 +173,6 @@ alter table t1 engine=merge; 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.