← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/systab_xt.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/systab_xt.cc
134
134
static void xt_my_set_notnull_in_record(Field *field, char *record)
135
135
{
136
136
        if (field->null_ptr)
137
 
                record[(uint) (field->null_ptr - (uchar *) field->getTable()->getInsertRecord())] &= (uchar) ~field->null_bit;
 
137
                record[(uint) (field->null_ptr - (uchar *) field->TABLE_RECORD_0)] &= (uchar) ~field->null_bit;
138
138
}
139
139
 
140
140
/*
244
244
#if MYSQL_VERSION_ID < 50114
245
245
                curr_field->ptr = (byte *) buf + curr_field->offset();
246
246
#else
247
 
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->getInsertRecord());
 
247
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->RECORD_0);
248
248
#endif
249
249
                switch (curr_field->field_name[0]) {
250
250
                        case 'A':
358
358
 
359
359
        tp_ptr = *((XTTablePathPtr *) xt_sl_item_at(ost_db->db_table_paths, row_id));
360
360
 
361
 
        for (Field **field=table->getFields() ; *field ; field++) {
 
361
        for (Field **field=TABLE_FIELDS ; *field ; field++) {
362
362
                curr_field = *field;
363
363
 
364
364
                save = curr_field->ptr;
365
365
#if MYSQL_VERSION_ID < 50114
366
366
                curr_field->ptr = (byte *) buf + curr_field->offset();
367
367
#else
368
 
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->getInsertRecord());
 
368
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->TABLE_RECORD_0);
369
369
#endif
370
370
                switch (curr_field->field_name[0]) {
371
371
                        case 'P':
469
469
        stat_name = xt_get_stat_meta_data(rec_id)->sm_name;
470
470
        stat_value = xt_get_statistic(&tt_statistics, ost_db, rec_id);
471
471
 
472
 
        for (Field **field=table->getFields() ; *field ; field++) {
 
472
        for (Field **field=TABLE_FIELDS ; *field ; field++) {
473
473
                curr_field = *field;
474
474
 
475
475
                save = curr_field->ptr;
476
476
#if MYSQL_VERSION_ID < 50114
477
477
                curr_field->ptr = (byte *) buf + curr_field->offset();
478
478
#else
479
 
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->getInsertRecord());
 
479
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->TABLE_RECORD_0);
480
480
#endif
481
481
                switch (curr_field->field_name[0]) {
482
482
                        case 'I':
541
541
void XTSystemTableShare::shutDown(XTThreadPtr XT_UNUSED(self))
542
542
{
543
543
        if (sys_lock_inited) {
544
 
                sys_location_lock.deinit();
545
 
                sys_statistics_lock.deinit();
 
544
                MYSQL_FREE_LOCK(sys_location_lock);
 
545
                MYSQL_FREE_LOCK(sys_statistics_lock);
546
546
                sys_lock_inited = FALSE;
547
547
        }
548
548
}