From 2f885bbe3485ad4ae08a4f61d86ff6e6cb813bdd Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Sat, 15 Jan 2005 10:14:12 -0800
Subject: [PATCH] Update results after merge

mysql-test/r/show_check.result:
  Update results
---
 mysql-test/r/show_check.result | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index e50c1e2fb0d..53882e6be69 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -412,7 +412,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) default NULL,
   KEY `i` (`i`)
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY USING HASH (i)) ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
@@ -420,7 +420,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) default NULL,
   KEY `i` USING HASH (`i`)
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;
 SHOW CREATE TABLE t1;
@@ -428,7 +428,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) default NULL,
   KEY `i` USING BTREE (`i`)
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
 SHOW CREATE TABLE t1;
@@ -459,7 +459,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) default NULL,
   KEY `i` (`i`)
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
 CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;
 SHOW CREATE TABLE t1;
@@ -474,5 +474,5 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `i` int(11) default NULL,
   KEY `i` USING BTREE (`i`)
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;