← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/systab_enabled_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_enabled_ms.cc
56
56
        {"Name",                        32,             NULL, MYSQL_TYPE_VARCHAR,       &UTF8_CHARSET,  NOT_NULL_FLAG,  "PBMS enabled engine name"},
57
57
        {"IsServer",            3,              NULL, MYSQL_TYPE_VARCHAR,       &UTF8_CHARSET,                                  NOT_NULL_FLAG,  "Enabled at server level."},
58
58
        {"Transactional",       5,              NULL, MYSQL_TYPE_VARCHAR,       &UTF8_CHARSET,                                  NOT_NULL_FLAG,  "Does the engine support transactions."},
59
 
        {"API-Version",         NULL,   NULL, MYSQL_TYPE_LONG,          NULL,                                                   NOT_NULL_FLAG,  "The PBMS enabled api version used."},
60
 
        {NULL,NULL, NULL, MYSQL_TYPE_STRING,NULL, 0, NULL}
 
59
        {"API-Version",         NOVAL,  NULL, MYSQL_TYPE_LONG,          NULL,                                                   NOT_NULL_FLAG,  "The PBMS enabled api version used."},
 
60
        {NULL,NOVAL, NULL, MYSQL_TYPE_STRING,NULL, 0, NULL}
61
61
};
62
62
 
63
63
DT_KEY_INFO pbms_enabled_keys[]=
107
107
        save_write_set = table->write_set;
108
108
        table->write_set = NULL;
109
109
 
 
110
#ifdef DRIZZLED
 
111
        memset(buf, 0xFF, table->getNullBytes());
 
112
#else
110
113
        memset(buf, 0xFF, table->s->null_bytes);
 
114
#endif
 
115
 
111
116
        for (Field **field=GET_TABLE_FIELDS(table) ; *field ; field++) {
112
117
                curr_field = *field;
113
118
                save = curr_field->ptr;
114
119
#if MYSQL_VERSION_ID < 50114
115
120
                curr_field->ptr = (byte *) buf + curr_field->offset();
116
121
#else
117
 
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->getInsertRecord());
 
122
#ifdef DRIZZLED
 
123
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->getTable()->getInsertRecord());
 
124
#else
 
125
                curr_field->ptr = (byte *) buf + curr_field->offset(curr_field->table->record[0]);
 
126
#endif
118
127
#endif
119
128
 
120
129
                switch (curr_field->field_name[0]) {