Output 'MEMORY' as table type for tables using the memory (nee heap) storage

engine, except when running with sql_mode & MYSQL323. (Bug #6659)


mysql-test/r/create.result:
  Fix test results
mysql-test/r/ctype_utf8.result:
  Fix test results
mysql-test/r/information_schema.result:
  Fix results
mysql-test/r/show_check.result:
  Fix results
sql/ha_heap.h:
  Output 'HEAP' in MySQL 3.23 compatibility mode
mysql-test/r/heap.result:
  Update results
mysql-test/r/sql_mode.result:
  Update results

1 files changed, 10 insertions, 10 deletions

diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
index 4d5aabb8b3a..f79bcf3f1dd 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/r/heap.result
@@ -266,7 +266,7 @@ t1	CREATE TABLE `t1` (
   `v` varchar(10) default NULL,
   `c` char(10) default NULL,
   `t` varchar(50) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 create table t2 like t1;
 show create table t2;
 Table	Create Table
@@ -274,7 +274,7 @@ t2	CREATE TABLE `t2` (
   `v` varchar(10) default NULL,
   `c` char(10) default NULL,
   `t` varchar(50) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 create table t3 select * from t1;
 show create table t3;
 Table	Create Table
@@ -282,7 +282,7 @@ t3	CREATE TABLE `t3` (
   `v` varchar(10) default NULL,
   `c` char(10) default NULL,
   `t` varchar(50) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 alter table t1 modify c varchar(10);
 show create table t1;
 Table	Create Table
@@ -290,7 +290,7 @@ t1	CREATE TABLE `t1` (
   `v` varchar(10) default NULL,
   `c` varchar(10) default NULL,
   `t` varchar(50) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 alter table t1 modify v char(10);
 show create table t1;
 Table	Create Table
@@ -298,7 +298,7 @@ t1	CREATE TABLE `t1` (
   `v` char(10) default NULL,
   `c` varchar(10) default NULL,
   `t` varchar(50) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 alter table t1 modify t varchar(10);
 Warnings:
 Warning	1265	Data truncated for column 't' at row 2
@@ -308,7 +308,7 @@ t1	CREATE TABLE `t1` (
   `v` char(10) default NULL,
   `c` varchar(10) default NULL,
   `t` varchar(10) default NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+*+*+ *
@@ -324,7 +324,7 @@ t1	CREATE TABLE `t1` (
   KEY `v` (`v`),
   KEY `c` (`c`),
   KEY `t` (`t`(10))
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 select count(*) from t1;
 count(*)
 270
@@ -559,7 +559,7 @@ t1	CREATE TABLE `t1` (
   KEY `v` USING BTREE (`v`),
   KEY `c` USING BTREE (`c`),
   KEY `t` USING BTREE (`t`(10))
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 select count(*) from t1;
 count(*)
 270
@@ -650,7 +650,7 @@ t1	CREATE TABLE `t1` (
   KEY `v` (`v`(5)),
   KEY `c` (`c`(5)),
   KEY `t` (`t`(5))
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (v varchar(65530), key(v(10)));
 show create table t1;
@@ -658,7 +658,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `v` varchar(65530) default NULL,
   KEY `v` (`v`(10))
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
 insert into t1 values(repeat('a',65530));
 select length(v) from t1 where v=repeat('a',65530);
 length(v)