← Back to branch summary

~stewart/drizzle/embedded-innodb-select-for-update

« back to all changes in this revision

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

  • Committer: Stewart Smith
  • Date: 2010-08-05 16:46:49 UTC
  • mfrom: (1283.156.85)
  • Revision ID: stewart@flamingspork.com-20100805164649-c2084khzo8y1igk5
Merged embedded-innodb-sec-index-prev into embedded-innodb-select-for-update.

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, memory::Root *mem_root);
 
117
        Cursor *create(TableShare& 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, memory::Root *mem_root)
 
260
Cursor *PBMSStorageEngine::create(TableShare& table)
261
261
{
262
262
        PBMSStorageEngine * const hton = this;
263
 
        return new (mem_root) ha_pbms(hton, table);
 
263
        return new ha_pbms(hton, table);
264
264
}
265
265
#else
266
266
static handler *pbms_create_handler(handlerton *hton, TABLE_SHARE *table, MEM_ROOT *mem_root)
697
697
        inner_();
698
698
        try_(a) {
699
699
                ha_open_tab = MSSystemTableShare::openSystemTable(table_path, table);
700
 
                thr_lock_data_init(&ha_open_tab->myShare->myThrLock, &ha_lock, NULL);
 
700
                thr_lock_data_init(&ha_open_tab->myShare->myThrLock, &ha_lock);
701
701
                ref_length = ha_open_tab->getRefLen();
702
702
        }
703
703
        catch_(a) {