~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/ha_heap.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:
42
42
    addAlias("HEAP");
43
43
  }
44
44
 
45
 
  virtual handler *create(TABLE_SHARE *table,
 
45
  virtual handler *create(TableShare *table,
46
46
                          MEM_ROOT *mem_root)
47
47
  {
48
48
    return new (mem_root) ha_heap(this, table);
74
74
** HEAP tables
75
75
*****************************************************************************/
76
76
 
77
 
ha_heap::ha_heap(StorageEngine *engine_arg, TABLE_SHARE *table_arg)
 
77
ha_heap::ha_heap(StorageEngine *engine_arg, TableShare *table_arg)
78
78
  :handler(engine_arg, table_arg), file(0), records_changed(0), key_stat_version(0),
79
79
  internal_table(0)
80
80
{}
635
635
  HA_KEYSEG *seg;
636
636
  char buff[FN_REFLEN];
637
637
  int error;
638
 
  TABLE_SHARE *share= table_arg->s;
 
638
  TableShare *share= table_arg->s;
639
639
  bool found_real_auto_increment= 0;
640
640
 
641
641
  if (!(columndef= (HP_COLUMNDEF*) malloc(column_count * sizeof(HP_COLUMNDEF))))