summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2004-12-14 18:47:34 +0400
committerunknown <ram@gw.mysql.r18.ru>2004-12-14 18:47:34 +0400
commite938cfcea6e12babc71d5c28789d4e876ae0021a (patch)
treebf5015dc5d45ff5e39f41913b0ba11c5c6b3a514 /mysql-test/r
parenta88f6fda403e71d2f69736b8426b08b67e4c9c03 (diff)
downloadmariadb-git-e938cfcea6e12babc71d5c28789d4e876ae0021a.tar.gz
Clean-up.
TYPE=MyISAM replaced with ENGINE=MyISAM.
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/subselect.result4
1 files changed, 1 insertions, 3 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');