← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/systab_cloud_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_cloud_ms.cc
57
57
 
58
58
DT_FIELD_INFO pbms_cloud_info[]=
59
59
{
60
 
        {"Id",                  NULL,   NULL, MYSQL_TYPE_LONG,          NULL,                   NOT_NULL_FLAG,  "The Cloud storage reference ID"},
 
60
        {"Id",                  NOVAL,  NULL, MYSQL_TYPE_LONG,          NULL,                   NOT_NULL_FLAG,  "The Cloud storage reference ID"},
61
61
        {"Server",              1024,   NULL, MYSQL_TYPE_VARCHAR,       &UTF8_CHARSET,  NOT_NULL_FLAG,  "S3 server name"},
62
62
        {"Bucket",              124,    NULL, MYSQL_TYPE_VARCHAR,       &UTF8_CHARSET,  NOT_NULL_FLAG,  "S3 bucket name"},
63
63
        {"PublicKey",   124,    NULL, MYSQL_TYPE_VARCHAR,       &UTF8_CHARSET,  NOT_NULL_FLAG,  "S3 public key"},
64
64
        {"PrivateKey",  124,    NULL, MYSQL_TYPE_VARCHAR,       &UTF8_CHARSET,  NOT_NULL_FLAG,  "S3 private key"},
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_cloud_keys[]=
250
250
        save_write_set = table->write_set;
251
251
        table->write_set = NULL;
252
252
 
 
253
#ifdef DRIZZLED
253
254
        memset(buf, 0xFF, table->getNullBytes());
 
255
#else
 
256
        memset(buf, 0xFF, table->s->null_bytes);
 
257
#endif
254
258
        for (Field **field=GET_TABLE_FIELDS(table) ; *field ; field++) {
255
259
                curr_field = *field;
256
260
                save = curr_field->ptr;
257
261
#if MYSQL_VERSION_ID < 50114
258
262
                curr_field->ptr = (byte *) buf + curr_field->offset();
259
263
#else
 
264
#ifdef DRIZZLED
260
265
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->getInsertRecord());
 
266
#else
 
267
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->record[0]);
 
268
#endif
261
269
#endif
262
270
                switch (curr_field->field_name[0]) {
263
271
                        case 'I':