← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Brian Aker
  • Date: 2009-10-16 10:27:33 UTC
  • mfrom: (1183.1.4 merge)
  • Revision ID: brian@gaz-20091016102733-b10po5oup0hjlilh
Merge Engine changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
65
65
                                     HTON_TEMPORARY_ONLY | 
66
66
                                     HTON_FILE_BASED ) {}
67
67
 
68
 
  virtual handler *create(TableShare *table,
 
68
  virtual Cursor *create(TableShare *table,
69
69
                          MEM_ROOT *mem_root)
70
70
  {
71
71
    return new (mem_root) ha_myisam(this, table);
457
457
 
458
458
ha_myisam::ha_myisam(drizzled::plugin::StorageEngine *engine_arg,
459
459
                     TableShare *table_arg)
460
 
  : handler(engine_arg, table_arg),
 
460
  : Cursor(engine_arg, table_arg),
461
461
    file(0),
462
462
    int_table_flags(HA_NULL_IN_KEY |
463
463
                    HA_DUPLICATE_POS |
471
471
     can_enable_indexes(1)
472
472
{}
473
473
 
474
 
handler *ha_myisam::clone(MEM_ROOT *mem_root)
 
474
Cursor *ha_myisam::clone(MEM_ROOT *mem_root)
475
475
{
476
 
  ha_myisam *new_handler= static_cast <ha_myisam *>(handler::clone(mem_root));
 
476
  ha_myisam *new_handler= static_cast <ha_myisam *>(Cursor::clone(mem_root));
477
477
  if (new_handler)
478
478
    new_handler->file->state= file->state;
479
479
  return new_handler;
800
800
    Enable indexes, which might have been disabled by disable_index() before.
801
801
    The modes without _SAVE work only if both data and indexes are empty,
802
802
    since the MyISAM repair would enable them persistently.
803
 
    To be sure in these cases, call handler::delete_all_rows() before.
 
803
    To be sure in these cases, call Cursor::delete_all_rows() before.
804
804
 
805
805
  IMPLEMENTATION
806
806
    HA_KEY_SWITCH_NONUNIQ       is not implemented.
1093
1093
  //if (!eq_range_arg)
1094
1094
  //  in_range_read= true;
1095
1095
 
1096
 
  res= handler::read_range_first(start_key, end_key, eq_range_arg, sorted);
 
1096
  res= Cursor::read_range_first(start_key, end_key, eq_range_arg, sorted);
1097
1097
 
1098
1098
  //if (res)
1099
1099
  //  in_range_read= false;
1103
1103
 
1104
1104
int ha_myisam::read_range_next()
1105
1105
{
1106
 
  int res= handler::read_range_next();
 
1106
  int res= Cursor::read_range_next();
1107
1107
  //if (res)
1108
1108
  //  in_range_read= false;
1109
1109
  return res;