← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/pbms_enabled.cc

  • Committer: Lee Bieber
  • Date: 2010-10-22 16:47:38 UTC
  • mfrom: (1841.1.7 drizzle_pbms)
  • Revision ID: kalebral@gmail.com-20101022164738-vv8w22b8towpb307
Merge Barry - fix bug 657830: PBMS build failure in GCC 4.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/pbms_enabled.cc
199
199
                        
200
200
                        
201
201
                // Get the blob record:
202
 
                field_offset = field->offset(field->table->getInsertRecord());
 
202
                field_offset = field->offset(field->table->record[0]);
203
203
                packlength = field->pack_length() - field->table->s->blob_ptr_size;
204
204
 
205
205
                if (new_null_blob) {
278
278
 
279
279
                // Get the blob record:
280
280
                packlength = field->pack_length() - field->table->s->blob_ptr_size;
281
 
                blob_rec = row_buffer + field->offset(field->table->getInsertRecord());
 
281
                blob_rec = row_buffer + field->offset(field->table->record[0]);
282
282
                
283
283
                length = field->get_length(blob_rec);
284
284
                memcpy(&blob_url, blob_rec +packlength, sizeof(char*));
330
330
                // Get the blob record:
331
331
                packlength = field->pack_length() - field->table->s->blob_ptr_size;
332
332
 
333
 
                blob_rec = row_buffer + field->offset(field->table->getInsertRecord());
 
333
                blob_rec = row_buffer + field->offset(field->table->record[0]);
334
334
                length = field->get_length(blob_rec);
335
335
                memcpy(&blob, blob_rec +packlength, sizeof(char*));
336
336