← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/systab_httpheader_ms.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/systab_httpheader_ms.cc
62
62
DT_FIELD_INFO pbms_metadata_headers_info[]=
63
63
{
64
64
        {"Name", 32,    NULL, MYSQL_TYPE_VARCHAR,       &UTF8_CHARSET,  NOT_NULL_FLAG,  "HTTP field name"},
65
 
        {NULL,  NULL,                           NULL, MYSQL_TYPE_STRING,        NULL, 0, NULL}
 
65
        {NULL,  NOVAL,                          NULL, MYSQL_TYPE_STRING,        NULL, 0, NULL}
66
66
};
67
67
 
68
68
DT_KEY_INFO pbms_metadata_headers_keys[]=
98
98
                                gDefaultMetaDataHeaders->setStringField(defaults, ptr - defaults);
99
99
                                gDefaultMetaDataHeaders->endRecord();
100
100
                        }
101
 
                        if (!ptr)
 
101
                        if (!*ptr)
102
102
                                break;
103
103
                                
104
104
                        defaults = ptr +1;
135
135
                
136
136
                
137
137
        } else if (gDefaultMetaDataHeaders) { // Load the defaults if they exist.
138
 
                headerData = RETAIN(gDefaultMetaDataHeaders);
139
 
                push_(headerData);
 
138
                headerData = gDefaultMetaDataHeaders;
140
139
        }
141
140
 
142
141
        if (headerData) {
148
147
                        }
149
148
                }
150
149
                
151
 
                release_(headerData); 
 
150
                if (headerData == gDefaultMetaDataHeaders)
 
151
                        gDefaultMetaDataHeaders->resetRecord();
 
152
                else {
 
153
                        release_(headerData); 
 
154
                }
152
155
        }
153
156
        
154
157
        release_(path); 
344
347
        save_write_set = table->write_set;
345
348
        table->write_set = NULL;
346
349
 
 
350
#ifdef DRIZZLED
347
351
        memset(buf, 0xFF, table->getNullBytes());
 
352
#else
 
353
        memset(buf, 0xFF, table->s->null_bytes);
 
354
#endif
348
355
        for (Field **field=GET_TABLE_FIELDS(table); *field ; field++) {
349
356
                curr_field = *field;
350
357
                save = curr_field->ptr;
351
358
#if MYSQL_VERSION_ID < 50114
352
359
                curr_field->ptr = (byte *) buf + curr_field->offset();
353
360
#else
 
361
#ifdef DRIZZLED
354
362
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->getInsertRecord());
 
363
#else
 
364
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->record[0]);
 
365
#endif
355
366
#endif
356
367
                switch (curr_field->field_name[0]) {
357
368
                        case 'N':