← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
27
27
#include <string>
28
28
 
29
29
 
30
 
 
 
30
using namespace drizzled;
31
31
using namespace std;
32
32
 
33
33
static const string engine_name("MEMORY");
53
53
  { }
54
54
 
55
55
  virtual Cursor *create(TableShare &table,
56
 
                          MEM_ROOT *mem_root)
 
56
                          memory::Root *mem_root)
57
57
  {
58
58
    return new (mem_root) ha_heap(*this, table);
59
59
  }
259
259
    with '\'-delimited path.
260
260
*/
261
261
 
262
 
Cursor *ha_heap::clone(MEM_ROOT *mem_root)
 
262
Cursor *ha_heap::clone(memory::Root *mem_root)
263
263
{
264
264
  Cursor *new_handler= table->s->db_type()->getCursor(*table->s, mem_root);
265
265