← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/ha_myisam.cc

Merged from PatG.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ha_myisam.cc
173
173
          if (j == 0)
174
174
            keydef[i].flag|= HA_PACK_KEY;
175
175
          if (!(field->flags & ZEROFILL_FLAG) &&
176
 
              (field->type() == FIELD_TYPE_STRING ||
177
 
               field->type() == FIELD_TYPE_VAR_STRING ||
 
176
              (field->type() == DRIZZLE_TYPE_STRING ||
 
177
               field->type() == DRIZZLE_TYPE_VAR_STRING ||
178
178
               ((int) (pos->key_part[j].length - field->decimals())) >= 4))
179
179
            keydef[i].seg[j].flag|= HA_SPACE_PACK;
180
180
        }
200
200
        keydef[i].seg[j].null_bit= 0;
201
201
        keydef[i].seg[j].null_pos= 0;
202
202
      }
203
 
      if (field->type() == FIELD_TYPE_BLOB)
 
203
      if (field->type() == DRIZZLE_TYPE_BLOB)
204
204
      {
205
205
        keydef[i].seg[j].flag|= HA_BLOB_PART;
206
206
        /* save number of bytes used to pack length */
249
249
 
250
250
    if (found->flags & BLOB_FLAG)
251
251
      recinfo_pos->type= (int) FIELD_BLOB;
252
 
    else if (found->type() == FIELD_TYPE_VARCHAR)
 
252
    else if (found->type() == DRIZZLE_TYPE_VARCHAR)
253
253
      recinfo_pos->type= FIELD_VARCHAR;
254
254
    else if (!(options & HA_OPTION_PACK_RECORD))
255
255
      recinfo_pos->type= (int) FIELD_NORMAL;
259
259
      recinfo_pos->type= (int) ((length <= 3 ||
260
260
                                 (found->flags & ZEROFILL_FLAG)) ?
261
261
                                  FIELD_NORMAL :
262
 
                                  found->type() == FIELD_TYPE_STRING ||
263
 
                                  found->type() == FIELD_TYPE_VAR_STRING ?
 
262
                                  found->type() == DRIZZLE_TYPE_STRING ||
 
263
                                  found->type() == DRIZZLE_TYPE_VAR_STRING ?
264
264
                                  FIELD_SKIP_ENDSPACE :
265
265
                                  FIELD_SKIP_PRESPACE);
266
266
    if (found->null_ptr)