← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/ha_xtsys.cc

  • Committer: lbieber
  • Date: 2010-09-22 13:48:54 UTC
  • mfrom: (1784.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100922134854-y7mae2taqhn73vsx
Merge Paul M. - latest changes from PBXT 1.0.11-7
Merge Paul M. - fix bug 641038 - pbxt rollback not working (tables reported as non-transactional)
Merge Andrew - fix show stoppers for new drizzledump

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/ha_xtsys.cc
97
97
                xt_ha_open_database_of_table(self, (XTPathStrPtr) table_path);
98
98
 
99
99
                ha_open_tab = XTSystemTableShare::openSystemTable(self, table_path, table);
100
 
                ha_lock.init(ha_open_tab->ost_share->sts_my_lock);
 
100
                MYSQL_INIT_LOCK(ha_lock, ha_open_tab->ost_share->sts_my_lock);
101
101
                ref_length = ha_open_tab->getRefLen();
102
102
        }
103
103
        catch_(a) {
149
149
        return err;
150
150
}
151
151
 
 
152
#ifdef DRIZZLED
152
153
int ha_xtsys::doStartTableScan(bool XT_UNUSED(scan))
 
154
#else
 
155
int ha_xtsys::rnd_init(bool XT_UNUSED(scan))
 
156
#endif
153
157
{
154
158
        int err = 0;
155
159