← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/system_table_ms.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/pbms/src/system_table_ms.cc
676
676
void MSOpenSystemTable::setNotNullInRecord(Field *field, char *record)
677
677
{
678
678
        if (field->null_ptr)
679
 
                record[(uint) (field->null_ptr - (uchar *) field->table->record[0])] &= (uchar) ~field->null_bit;
 
679
                record[(uint) (field->null_ptr - (uchar *) field->getTable()->record[0])] &= (uchar) ~field->null_bit;
680
680
}
681
681
 
682
682
/*
967
967
#if MYSQL_VERSION_ID < 50114
968
968
                curr_field->ptr = (byte *) buf + curr_field->offset();
969
969
#else
970
 
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->record[0]);
 
970
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->record[0]);
971
971
#endif
972
972
                switch (curr_field->field_name[0]) {
973
973
                        case 'A':
1129
1129
#if MYSQL_VERSION_ID < 50114
1130
1130
                curr_field->ptr = (byte *) buf + curr_field->offset();
1131
1131
#else
1132
 
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->record[0]);
 
1132
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->record[0]);
1133
1133
#endif
1134
1134
                switch (curr_field->field_name[0]) {
1135
1135
                        case 'R':
1572
1572
#if MYSQL_VERSION_ID < 50114
1573
1573
                curr_field->ptr = (byte *) buf + curr_field->offset();
1574
1574
#else
1575
 
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->record[0]);
 
1575
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->record[0]);
1576
1576
#endif
1577
1577
                switch (curr_field->field_name[0]) {
1578
1578
                        case 'B':
1929
1929
#if MYSQL_VERSION_ID < 50114
1930
1930
                curr_field->ptr = (byte *) buf + curr_field->offset();
1931
1931
#else
1932
 
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->record[0]);
 
1932
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->record[0]);
1933
1933
#endif
1934
1934
                switch (curr_field->field_name[0]) {
1935
1935
                        case 'R':