← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/ha_pbms.cc

  • Committer: Brian Aker
  • Date: 2010-10-22 23:33:58 UTC
  • mfrom: (1869.1.7 refactor)
  • Revision ID: brian@tangent.org-20101022233358-kmtrpm1yvmmyaame
Merge in overhaul to how cursor and table are handled. Cursor now only knows
about table, and will always have a table and engine reference.

This cleans up a number of ownership issues, the biggest being that it now
creates the space needed for the next big refactor in locks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/ha_pbms.cc
114
114
        int doStartTransaction(Session *session, start_transaction_option_t options);
115
115
        int doCommit(Session *, bool);
116
116
        int doRollback(Session *, bool);
117
 
        Cursor *create(TableShare& table);
 
117
        Cursor *create(Table& table);
118
118
        bool doDropSchema(const drizzled::SchemaIdentifier&);
119
119
        
120
120
        /*
257
257
 
258
258
 
259
259
#ifdef DRIZZLED
260
 
Cursor *PBMSStorageEngine::create(TableShare& table)
 
260
Cursor *PBMSStorageEngine::create(Table& table)
261
261
{
262
262
        PBMSStorageEngine * const hton = this;
263
263
        return new ha_pbms(hton, table);
655
655
}
656
656
 
657
657
#ifdef DRIZZLED
658
 
ha_pbms::ha_pbms(handlerton *hton, TableShare& table_arg) : handler(*hton, table_arg),
 
658
ha_pbms::ha_pbms(handlerton *hton, Table& table_arg) : handler(*hton, table_arg),
659
659
#else
660
660
ha_pbms::ha_pbms(handlerton *hton, TABLE_SHARE *table_arg) : handler(hton, table_arg),
661
661
#endif
696
696
 
697
697
        inner_();
698
698
        try_(a) {
699
 
                ha_open_tab = MSSystemTableShare::openSystemTable(table_path, table);
 
699
                ha_open_tab = MSSystemTableShare::openSystemTable(table_path, getTable());
700
700
#ifdef DRIZZLED
701
701
                ha_lock.init(&ha_open_tab->myShare->myThrLock);
702
702
#else