summaryrefslogtreecommitdiff
path: root/mysql-test/r/create.result
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-01-13 17:38:13 -0800
committerunknown <jimw@mysql.com>2005-01-13 17:38:13 -0800
commit8a5fe7cfdfb8ff893c387153bee7c1600cd0795b (patch)
tree5b093c9fc53f3273eb056f91849529e6083a5c77 /mysql-test/r/create.result
parentfd7e0d847b6fd2d0f9729b3c6a37f19e62d67128 (diff)
downloadmariadb-git-8a5fe7cfdfb8ff893c387153bee7c1600cd0795b.tar.gz
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
Diffstat (limited to 'mysql-test/r/create.result')
-rw-r--r--mysql-test/r/create.result8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index f2e91c36f75..05d1ba026ba 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -204,7 +204,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
drop table t1;
SET SESSION storage_engine="gemini";
ERROR 42000: Unknown table engine 'gemini'
@@ -216,7 +216,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
SET SESSION storage_engine=default;
drop table t1;
create table t1 ( k1 varchar(2), k2 int, primary key(k1,k2));
@@ -361,7 +361,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
drop table t1;
SET SESSION storage_engine="gemini";
ERROR 42000: Unknown table engine 'gemini'
@@ -373,7 +373,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL
-) ENGINE=HEAP DEFAULT CHARSET=latin1
+) ENGINE=MEMORY DEFAULT CHARSET=latin1
SET SESSION storage_engine=default;
drop table t1;
create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob);