← 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: lbieber
  • Date: 2010-10-06 16:34:16 UTC
  • mfrom: (1816.1.3 build)
  • Revision ID: lbieber@orisndriz08-20101006163416-ea0sl59qgpglk21y
Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2
Merge Andrew - fix bug 650935: remove --compress from all clients
Merge Andrew - fix bug 653471: Add -A to drizzle client
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/pbms_enabled.cc
1
 
/* Copyright (C) 2010 PrimeBase Technologies GmbH
 
1
/* Copyright (c) 2010 PrimeBase Technologies GmbH
2
2
 * All rights reserved.
3
3
 * 
4
4
 * Redistribution and use in source and binary forms, with or without 
135
135
        size_t length;
136
136
        PBMSBlobURLRec blob_url;
137
137
        
138
 
        err = pbms_api.retainBlob(DB_NAME(field), TAB_NAME(field), &blob_url, blob, org_length, field->position(), result);
 
138
        err = pbms_api.retainBlob(DB_NAME(field), TAB_NAME(field), &blob_url, blob, org_length, field->field_index, result);
139
139
        if (err)
140
140
                return err;
141
141
                
199
199
                        
200
200
                        
201
201
                // Get the blob record:
202
 
                field_offset = field->offset(field->table->record[0]);
 
202
                field_offset = field->offset(field->table->getInsertRecord());
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->record[0]);
 
281
                blob_rec = row_buffer + field->offset(field->table->getInsertRecord());
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->record[0]);
 
333
                blob_rec = row_buffer + field->offset(field->table->getInsertRecord());
334
334
                length = field->get_length(blob_rec);
335
335
                memcpy(&blob, blob_rec +packlength, sizeof(char*));
336
336