From cfdf5fee2087dde1db4239b4d9a9f16bfb78ac05 Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Sun, 19 Aug 2001 14:43:51 +0300
Subject: Fix of UNION code Added heap_delete_table Added
 HA_EXTRA_PREPARE_FOR_DELETE Added and use my_dup() for faster open of tables.
 Removed not working no-mix-table-type

BitKeeper/deleted/.del-=6~33f33b0a159dc5d5:
  Delete: =6
heap/hp_clear.c:
  Cleanup
heap/hp_close.c:
  Added delayed delete
heap/hp_create.c:
  Added heap_delete_table
heap/hp_delete.c:
  cleanup
heap/hp_test2.c:
  Added heap_delete_table
include/heap.h:
  Added heap_delete_table
include/my_base.h:
  Added HA_EXTRA_PREPARE_FOR_DELETE
include/my_sys.h:
  Adde my_dup and set_prealloc_root
isam/extra.c:
  Added HA_EXTRA_PREPARE_FOR_DELETE
myisam/mi_check.c:
  use my_dup
myisam/mi_extra.c:
  use my_dup
myisam/mi_open.c:
  use my_dup
myisam/myisamchk.c:
  use my_dup
myisam/myisamdef.h:
  use my_dup
mysys/Makefile.am:
  my_dup
mysys/hash.c:
  Add hash_replace
mysys/mf_pack.c:
  cleanup
mysys/my_alloc.c:
  Add set_prealloc_root
mysys/my_fstream.c:
  cleanup
mysys/my_lib.c:
  cleanup
mysys/my_seek.c:
  cleanup
sql/ha_heap.cc:
  Uses heap_delete_table()
sql/mysqld.cc:
  Fix SIGHUP usage
  Remove no-mix-table-types
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/sql_base.cc:
  remove no-mix-table-type
sql/sql_parse.cc:
  Fix UNION code
---
 heap/hp_create.c | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

(limited to 'heap/hp_create.c')

diff --git a/heap/hp_create.c b/heap/hp_create.c
index 01c5f43adfd..da91e412180 100644
--- a/heap/hp_create.c
+++ b/heap/hp_create.c
@@ -21,33 +21,49 @@
 
 #include "heapdef.h"
 
+
 int heap_create(const char *name)
 {
+  reg1 HP_SHARE *share;
   DBUG_ENTER("heap_create");
-  (void) heap_delete_all(name);
+  pthread_mutex_lock(&THR_LOCK_heap);
+  if ((share=_hp_find_named_heap(name)))
+  {
+    if (share->open_count == 0)
+      _hp_free(share);
+  }
+  else
+  {
+    my_errno=ENOENT;
+  }
+  pthread_mutex_unlock(&THR_LOCK_heap);
   DBUG_RETURN(0);
 }
 
-int heap_delete_all(const char *name)
+int heap_delete_table(const char *name)
 {
-  reg1 HP_SHARE *info;
-  int found;
-  DBUG_ENTER("heap_delete_all");
+  int result;
+  reg1 HP_SHARE *share;
+  DBUG_ENTER("heap_delete_table");
+
   pthread_mutex_lock(&THR_LOCK_heap);
-  if ((info=_hp_find_named_heap(name)))
+  if ((share=_hp_find_named_heap(name)))
   {
-    if (info->open_count == 0)
-      _hp_free(info);
-    found=0;
+    if (share->open_count == 0)
+      _hp_free(share);
+    else
+     share->delete_on_close=1;
+    result=0;
   }
   else
   {
-    found=my_errno=ENOENT;
+    result=my_errno=ENOENT;
   }
   pthread_mutex_unlock(&THR_LOCK_heap);
-  DBUG_RETURN(found);
+  DBUG_RETURN(result);
 }
 
+
 void _hp_free(HP_SHARE *share)
 {
   heap_share_list=list_delete(heap_share_list,&share->open_list);
-- 
cgit v1.2.1