From d599808fbc05c56dba2f1fb7121cc2b83eedfb26 Mon Sep 17 00:00:00 2001
From: "ram@gw.mysql.r18.ru" <>
Date: Tue, 14 Dec 2004 18:47:34 +0400
Subject: [PATCH] Clean-up. TYPE=MyISAM replaced with ENGINE=MyISAM.

---
 mysql-test/r/subselect.result | 4 +---
 mysql-test/t/subselect.test   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index fc23331ad7b..0735f133e6f 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -2115,9 +2115,7 @@ GovernmentForm char(45) NOT NULL default '',
 HeadOfState char(60) default NULL,
 Capital int(11) default NULL,
 Code2 char(2) NOT NULL default ''
-) TYPE=MyISAM;
-Warnings:
-Warning	1287	'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
+) ENGINE=MyISAM;
 INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');
 INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');
 INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes françaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index b5b5de069bf..f59851fa722 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -1378,7 +1378,7 @@ CREATE TABLE t1 (
   HeadOfState char(60) default NULL,
   Capital int(11) default NULL,
   Code2 char(2) NOT NULL default ''
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');
 INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');
 INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes françaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');