← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/handler/ha_innodb.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/innobase/handler/ha_innodb.cc
282
282
                        /* out: 0 or error number */
283
283
        XID     *xid);  /* in: X/Open XA transaction identification */
284
284
 
285
 
  virtual handler *create(TABLE_SHARE *table,
 
285
  virtual handler *create(TableShare *table,
286
286
                          MEM_ROOT *mem_root)
287
287
  {
288
288
    return new (mem_root) ha_innobase(this, table);
1297
1297
/*************************************************************************
1298
1298
Construct ha_innobase handler. */
1299
1299
UNIV_INTERN
1300
 
ha_innobase::ha_innobase(StorageEngine *engine_arg, TABLE_SHARE *table_arg)
 
1300
ha_innobase::ha_innobase(StorageEngine *engine_arg, TableShare *table_arg)
1301
1301
  :handler(engine_arg, table_arg),
1302
1302
  int_table_flags(HA_REC_NOT_IN_SEQ |
1303
1303
                  HA_NULL_IN_KEY |