← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/ha_myisam.cc

  • Committer: Brian Aker
  • Date: 2009-04-29 01:45:36 UTC
  • mfrom: (1000.1.6 merge)
  • Revision ID: brian@gaz-20090429014536-pwu5m8ug6n8fvh68
Merge refactoring (mainly around TABLE_SHARE... one step forward...)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ha_myisam.cc
66
66
  MyisamEngine(string name_arg)
67
67
   : StorageEngine(name_arg, HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES) {}
68
68
 
69
 
  virtual handler *create(TABLE_SHARE *table,
 
69
  virtual handler *create(TableShare *table,
70
70
                          MEM_ROOT *mem_root)
71
71
  {
72
72
    return new (mem_root) ha_myisam(this, table);
155
155
  MI_KEYDEF *keydef;
156
156
  MI_COLUMNDEF *recinfo, *recinfo_pos;
157
157
  HA_KEYSEG *keyseg;
158
 
  TABLE_SHARE *share= table_arg->s;
 
158
  TableShare *share= table_arg->s;
159
159
  uint32_t options= share->db_options_in_use;
160
160
  if (!(my_multi_malloc(MYF(MY_WME),
161
161
          recinfo_out, (share->fields * 2 + 2) * sizeof(MI_COLUMNDEF),
483
483
 
484
484
}
485
485
 
486
 
ha_myisam::ha_myisam(StorageEngine *engine_arg, TABLE_SHARE *table_arg)
 
486
ha_myisam::ha_myisam(StorageEngine *engine_arg, TableShare *table_arg)
487
487
  :handler(engine_arg, table_arg), file(0),
488
488
  int_table_flags(HA_NULL_IN_KEY |
489
489
                  HA_BINLOG_ROW_CAPABLE |
1532
1532
  }
1533
1533
  if (flag & HA_STATUS_CONST)
1534
1534
  {
1535
 
    TABLE_SHARE *share= table->s;
 
1535
    TableShare *share= table->s;
1536
1536
    stats.max_data_file_length=  misam_info.max_data_file_length;
1537
1537
    stats.max_index_file_length= misam_info.max_index_file_length;
1538
1538
    stats.create_time= misam_info.create_time;
1653
1653
  MI_KEYDEF *keydef;
1654
1654
  MI_COLUMNDEF *recinfo;
1655
1655
  MI_CREATE_INFO create_info;
1656
 
  TABLE_SHARE *share= table_arg->s;
 
1656
  TableShare *share= table_arg->s;
1657
1657
  uint32_t options= share->db_options_in_use;
1658
1658
  if ((error= table2myisam(table_arg, &keydef, &recinfo, &create_records)))
1659
1659
    return(error); /* purecov: inspected */