summaryrefslogtreecommitdiff
path: root/storage/heap
diff options
context:
space:
mode:
Diffstat (limited to 'storage/heap')
-rw-r--r--storage/heap/ha_heap.cc14
-rw-r--r--storage/heap/ha_heap.h2
2 files changed, 10 insertions, 6 deletions
diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index 1b76b24bd5d..5991fdbf987 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -25,7 +25,9 @@
#include "ha_heap.h"
-static handler *heap_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root);
+static handler *heap_create_handler(handlerton *hton,
+ TABLE_SHARE *table,
+ MEM_ROOT *mem_root);
handlerton *heap_hton;
@@ -41,9 +43,11 @@ int heap_init(void *p)
return 0;
}
-static handler *heap_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
+static handler *heap_create_handler(handlerton *hton,
+ TABLE_SHARE *table,
+ MEM_ROOT *mem_root)
{
- return new (mem_root) ha_heap(table);
+ return new (mem_root) ha_heap(hton, table);
}
@@ -51,8 +55,8 @@ static handler *heap_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
** HEAP tables
*****************************************************************************/
-ha_heap::ha_heap(TABLE_SHARE *table_arg)
- :handler(heap_hton, table_arg), file(0), records_changed(0),
+ha_heap::ha_heap(handlerton *hton, TABLE_SHARE *table_arg)
+ :handler(hton, table_arg), file(0), records_changed(0),
key_stat_version(0)
{}
diff --git a/storage/heap/ha_heap.h b/storage/heap/ha_heap.h
index 00e59856f26..0f6386655cb 100644
--- a/storage/heap/ha_heap.h
+++ b/storage/heap/ha_heap.h
@@ -31,7 +31,7 @@ class ha_heap: public handler
uint records_changed;
uint key_stat_version;
public:
- ha_heap(TABLE_SHARE *table);
+ ha_heap(handlerton *hton, TABLE_SHARE *table);
~ha_heap() {}
const char *table_type() const
{