From bc78a46ac4747bf430807f1969c207e13118404e Mon Sep 17 00:00:00 2001
From: "acurtis@pcgem.rdg.cyberkinetica.com" <>
Date: Wed, 11 Aug 2004 23:24:36 +0100
Subject: Bug#4411   Fix for server hang bug

---
 mysql-test/r/heap.result | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'mysql-test/r/heap.result')

diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
index bdf7dc225f3..11958f0a619 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/r/heap.result
@@ -217,3 +217,13 @@ DELETE from t1 where a < 100;
 SELECT * from t1;
 a
 DROP TABLE t1;
+CREATE TABLE `job_titles` (
+`job_title_id` int(6) unsigned NOT NULL default '0',
+`job_title` char(18) NOT NULL default '',
+PRIMARY KEY  (`job_title_id`),
+UNIQUE KEY `job_title_id` (`job_title_id`,`job_title`)
+) TYPE=HEAP;
+SELECT MAX(job_title_id) FROM job_titles;
+MAX(job_title_id)
+NULL
+DROP TABLE job_titles;
-- 
cgit v1.2.1


From 3f2210c06445535f3beae31a8cecb3ae73c1d236 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Thu, 19 Aug 2004 03:02:09 +0200
Subject: after merge fixes

---
 mysql-test/r/heap.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mysql-test/r/heap.result')

diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result
index b7f44e6e19c..c49c9abb368 100644
--- a/mysql-test/r/heap.result
+++ b/mysql-test/r/heap.result
@@ -222,7 +222,7 @@ CREATE TABLE `job_titles` (
 `job_title` char(18) NOT NULL default '',
 PRIMARY KEY  (`job_title_id`),
 UNIQUE KEY `job_title_id` (`job_title_id`,`job_title`)
-) TYPE=HEAP;
+) ENGINE=HEAP;
 SELECT MAX(job_title_id) FROM job_titles;
 MAX(job_title_id)
 NULL
-- 
cgit v1.2.1