← 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: Monty Taylor
  • Date: 2011-03-11 18:48:55 UTC
  • mfrom: (2228.1.8 build)
  • Revision ID: mordred@inaugust.com-20110311184855-1essd3a6xfr7lx6r
Merged Andrew: drizzledump and docs bug fixes
Merged Barry: pbms bugfixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/ha_pbms.cc
697
697
 
698
698
        inner_();
699
699
        try_(a) {
 
700
#ifdef DRIZZLED
700
701
                ha_open_tab = MSSystemTableShare::openSystemTable(table_path, getTable());
701
 
#ifdef DRIZZLED
702
702
                ha_lock.init(&ha_open_tab->myShare->myThrLock);
703
703
#else
 
704
                ha_open_tab = MSSystemTableShare::openSystemTable(table_path, table);
704
705
                thr_lock_data_init(&ha_open_tab->myShare->myThrLock, &ha_lock, NULL);
705
706
#endif
706
707
                ref_length = ha_open_tab->getRefLen();
930
931
//-------
931
932
void ha_pbms::position(const unsigned char *)
932
933
{
933
 
        ha_open_tab->seqScanPos((uint8_t *) ref);
 
934
        ha_open_tab->seqScanPos((unsigned char *) ref);
934
935
}
935
936
 
936
937
//-------
939
940
        int err = 0;
940
941
        enter_();
941
942
        try_(a) {
942
 
                ha_open_tab->seqScanRead((uint8_t *) pos, (char *) buf);
 
943
                ha_open_tab->seqScanRead(pos, (char *) buf);
943
944
        }
944
945
        catch_(a) {
945
946
                ha_error = MSEngine::exceptionToResult(&self->myException, &ha_result);