← 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: Brian Aker
  • Date: 2010-07-16 19:54:08 UTC
  • mfrom: (1660.1.4 rollup)
  • Revision ID: brian@gaz-20100716195408-8fiuxwmy4mpqq4ko
Rollup patch + fix for not intel processors.

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->table->record[0])] &= (uchar) ~field->null_bit;
 
137
                record[(uint) (field->null_ptr - (uchar *) field->getTable()->record[0])] &= (uchar) ~field->null_bit;
138
138
}
139
139
 
140
140
/*
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->table->record[0]);
 
368
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->record[0]);
369
369
#endif
370
370
                switch (curr_field->field_name[0]) {
371
371
                        case 'P':
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->table->record[0]);
 
479
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->record[0]);
480
480
#endif
481
481
                switch (curr_field->field_name[0]) {
482
482
                        case 'I':