Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 152 insertions, 0 deletions

diff --git a/storage/heap/hp_open.c b/storage/heap/hp_open.c
new file mode 100644
index 00000000..272c4a3a
--- /dev/null
+++ b/storage/heap/hp_open.c
@@ -0,0 +1,152 @@
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+/* open a heap-database */
+
+#include "heapdef.h"
+#include "my_sys.h"
+
+/*
+  Open heap table based on HP_SHARE structure
+  
+  NOTE
+    This doesn't register the table in the open table list.
+*/
+
+HP_INFO *heap_open_from_share(HP_SHARE *share, int mode)
+{
+  HP_INFO *info;
+  DBUG_ENTER("heap_open_from_share");
+
+  if (!(info= (HP_INFO*) my_malloc(hp_key_memory_HP_INFO,
+                                   sizeof(HP_INFO) + 2 * share->max_key_length,
+                                   MYF(MY_ZEROFILL +
+                                       (share->internal ?
+                                        MY_THREAD_SPECIFIC : 0)))))
+  {
+    DBUG_RETURN(0);
+  }
+  share->open_count++; 
+  thr_lock_data_init(&share->lock,&info->lock,NULL);
+  info->s= share;
+  info->lastkey= (uchar*) (info + 1);
+  info->recbuf= (uchar*) (info->lastkey + share->max_key_length);
+  info->mode= mode;
+  info->current_record= (ulong) ~0L;		/* No current record */
+  info->lastinx= info->errkey= -1;
+#ifndef DBUG_OFF
+  info->opt_flag= READ_CHECK_USED;		/* Check when changing */
+#endif
+  DBUG_PRINT("exit",("heap: %p  reclength: %d  records_in_block: %lu",
+		     info, share->reclength,
+                     share->block.records_in_block));
+  DBUG_RETURN(info);
+}
+
+
+/*
+  Open heap table based on HP_SHARE structure and register it
+*/
+
+HP_INFO *heap_open_from_share_and_register(HP_SHARE *share, int mode)
+{
+  HP_INFO *info;
+  DBUG_ENTER("heap_open_from_share_and_register");
+
+  mysql_mutex_lock(&THR_LOCK_heap);
+  if ((info= heap_open_from_share(share, mode)))
+  {
+    info->open_list.data= (void*) info;
+    heap_open_list= list_add(heap_open_list,&info->open_list);
+    /* Unpin the share, it is now pinned by the file. */
+    share->open_count--;
+  }
+  mysql_mutex_unlock(&THR_LOCK_heap);
+  DBUG_RETURN(info);
+}
+
+
+/**
+  Dereference a HEAP share and free it if it's not referenced.
+  We don't check open_count for internal tables since they
+  are always thread-local, i.e. referenced by a single thread.
+*/
+void heap_release_share(HP_SHARE *share, my_bool internal_table)
+{
+  /* Couldn't open table; Remove the newly created table */
+  if (internal_table)
+    hp_free(share);
+  else
+  {
+    mysql_mutex_lock(&THR_LOCK_heap);
+    if (--share->open_count == 0)
+      hp_free(share);
+    mysql_mutex_unlock(&THR_LOCK_heap);
+  }
+}
+
+/*
+  Open heap table based on name
+
+  NOTE
+    This register the table in the open table list. so that it can be
+    found by future heap_open() calls.
+*/
+
+HP_INFO *heap_open(const char *name, int mode)
+{
+  HP_INFO *info;
+  HP_SHARE *share;
+  DBUG_ENTER("heap_open");
+
+  mysql_mutex_lock(&THR_LOCK_heap);
+  if (!(share= hp_find_named_heap(name)))
+  {
+    my_errno= ENOENT;
+    mysql_mutex_unlock(&THR_LOCK_heap);
+    DBUG_RETURN(0);
+  }
+  if ((info= heap_open_from_share(share, mode)))
+  {
+    info->open_list.data= (void*) info;
+    heap_open_list= list_add(heap_open_list,&info->open_list);
+  }
+  mysql_mutex_unlock(&THR_LOCK_heap);
+  DBUG_RETURN(info);
+}
+
+
+/* map name to a heap-nr. If name isn't found return 0 */
+
+HP_SHARE *hp_find_named_heap(const char *name)
+{
+  LIST *pos;
+  HP_SHARE *info;
+  DBUG_ENTER("heap_find");
+  DBUG_PRINT("enter",("name: %s",name));
+
+  for (pos= heap_share_list; pos; pos= pos->next)
+  {
+    info= (HP_SHARE*) pos->data;
+    if (!strcmp(name, info->name))
+    {
+      DBUG_PRINT("exit", ("Old heap_database: %p", info));
+      DBUG_RETURN(info);
+    }
+  }
+  DBUG_RETURN((HP_SHARE *) 0);
+}
+
+