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, 45 insertions, 0 deletions

diff --git a/storage/heap/hp_info.c b/storage/heap/hp_info.c
new file mode 100644
index 00000000..41596d86
--- /dev/null
+++ b/storage/heap/hp_info.c
@@ -0,0 +1,45 @@
+/* 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 Street, Fifth Floor, Boston, MA  02110-1335  USA */
+
+/* Returns info about database status */
+
+#include "heapdef.h"
+
+
+uchar *heap_position(HP_INFO *info)
+{
+  return ((info->update & HA_STATE_AKTIV) ? info->current_ptr :
+	  (HEAP_PTR) 0);
+}
+
+
+/* Note that heap_info does NOT return information about the
+   current position anymore;  Use heap_position instead */
+
+int heap_info(reg1 HP_INFO *info,reg2 HEAPINFO *x, int flag )
+{
+  DBUG_ENTER("heap_info");
+  x->records         = info->s->records;
+  x->deleted         = info->s->deleted;
+  x->reclength       = info->s->reclength;
+  x->data_length     = info->s->data_length;
+  x->index_length    = info->s->index_length;
+  x->max_records     = info->s->max_records;
+  x->errkey          = info->errkey;
+  x->create_time     = info->s->create_time;
+  if (flag & HA_STATUS_AUTO)
+    x->auto_increment= info->s->auto_increment + 1;
+  DBUG_RETURN(0);
+} /* heap_info */