← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

Merged captain branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
55
55
    return ha_heap_exts;
56
56
  }
57
57
 
58
 
  int createTableImpl(Session *session, const char *table_name,
59
 
                      Table *table_arg, HA_CREATE_INFO *create_info);
 
58
  int createTableImplementation(Session *session, const char *table_name,
 
59
                                Table *table_arg, HA_CREATE_INFO *create_info,
 
60
                                drizzled::message::Table*);
60
61
 
61
62
  /* For whatever reason, internal tables can be created by handler::open()
62
63
     for HEAP.
68
69
                        bool internal_table,
69
70
                        HP_SHARE **internal_share);
70
71
 
71
 
  int renameTableImpl(Session*, const char * from, const char * to);
 
72
  int renameTableImplementation(Session*, const char * from, const char * to);
72
73
 
73
 
  int deleteTableImpl(Session *, const string table_path);
 
74
  int deleteTableImplementation(Session *, const string table_path);
74
75
};
75
76
 
76
77
/*
77
78
  We have to ignore ENOENT entries as the HEAP table is created on open and
78
79
  not when doing a CREATE on the table.
79
80
*/
80
 
int HeapEngine::deleteTableImpl(Session*, const string table_path)
 
81
int HeapEngine::deleteTableImplementation(Session*, const string table_path)
81
82
{
82
83
  return heap_delete_table(table_path.c_str());
83
84
}
610
611
}
611
612
 
612
613
 
613
 
int HeapEngine::renameTableImpl(Session*, const char *from, const char *to)
 
614
int HeapEngine::renameTableImplementation(Session*,
 
615
                                          const char *from, const char *to)
614
616
{
615
617
  return heap_rename(from,to);
616
618
}
638
640
  return key->rec_per_key[key->key_parts-1];
639
641
}
640
642
 
641
 
int HeapEngine::createTableImpl(Session *session, const char *table_name,
642
 
                                Table *table_arg,
643
 
                                HA_CREATE_INFO *create_info)
 
643
int HeapEngine::createTableImplementation(Session *session,
 
644
                                          const char *table_name,
 
645
                                          Table *table_arg,
 
646
                                          HA_CREATE_INFO *create_info,
 
647
                                          drizzled::message::Table*)
644
648
{
645
649
  HP_SHARE *internal_share;
646
650
  return heap_create_table(session, table_name, table_arg, create_info,