← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

  • Committer: brian
  • Date: 2009-11-11 19:42:27 UTC
  • mfrom: (1211 staging)
  • mto: (1211.1.4 staging)
  • mto: This revision was merged to the branch mainline in revision 1212.
  • Revision ID: brian@orisndriz04-20091111194227-mky4am3ym0dlosaa
Update for Cursor renaming.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
40
40
{
41
41
public:
42
42
  HeapEngine(string name_arg)
43
 
   : drizzled::plugin::StorageEngine(name_arg,
44
 
                                     HTON_CAN_RECREATE|HTON_TEMPORARY_ONLY)
 
43
   : drizzled::plugin::StorageEngine(name_arg, 
 
44
                                     HTON_TEMPORARY_ONLY)
45
45
  {
46
46
    addAlias("HEAP");
47
47
  }
48
48
 
49
 
  virtual Cursor *create(TableShare *table,
 
49
  virtual Cursor *create(TableShare &table,
50
50
                          MEM_ROOT *mem_root)
51
51
  {
52
 
    return new (mem_root) ha_heap(this, table);
 
52
    return new (mem_root) ha_heap(*this, table);
53
53
  }
54
54
 
55
55
  const char **bas_ext() const {
157
157
** HEAP tables
158
158
*****************************************************************************/
159
159
 
160
 
ha_heap::ha_heap(drizzled::plugin::StorageEngine *engine_arg,
161
 
                 TableShare *table_arg)
 
160
ha_heap::ha_heap(drizzled::plugin::StorageEngine &engine_arg,
 
161
                 TableShare &table_arg)
162
162
  :Cursor(engine_arg, table_arg), file(0), records_changed(0), key_stat_version(0),
163
163
  internal_table(0)
164
164
{}
238
238
 
239
239
Cursor *ha_heap::clone(MEM_ROOT *mem_root)
240
240
{
241
 
  Cursor *new_handler= table->s->db_type()->getCursor(table->s, mem_root);
 
241
  Cursor *new_handler= table->s->db_type()->getCursor(*table->s, mem_root);
242
242
 
243
243
  if (new_handler && !new_handler->ha_open(table, file->s->name, table->db_stat,
244
244
                                           HA_OPEN_IGNORE_IF_LOCKED))
686
686
 
687
687
int HeapEngine::doCreateTable(Session *session,
688
688
                              const char *table_name,
689
 
                              Table& table_arg,
 
689
                              Table &table_arg,
690
690
                              HA_CREATE_INFO& create_info,
691
691
                              drizzled::message::Table& create_proto)
692
692
{
708
708
 
709
709
 
710
710
int HeapEngine::heap_create_table(Session *session, const char *table_name,
711
 
                             Table *table_arg, HA_CREATE_INFO& create_info,
712
 
                             bool internal_table, HP_SHARE **internal_share)
 
711
                                  Table *table_arg, HA_CREATE_INFO& create_info,
 
712
                                  bool internal_table, HP_SHARE **internal_share)
713
713
{
714
714
  uint32_t key, parts, mem_per_row_keys= 0, keys= table_arg->s->keys;
715
715
  uint32_t auto_key= 0, auto_key_type= 0;