← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/ha_myisam.cc

  • Committer: Monty Taylor
  • Date: 2008-07-31 05:13:04 UTC
  • mfrom: (240 drizzle)
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 243.
  • Revision ID: monty@inaugust.com-20080731051304-a9kawbozru3fic1g
Merged from trunk.

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->type() == DRIZZLE_TYPE_STRING ||
176
 
               field->type() == DRIZZLE_TYPE_VAR_STRING ||
177
176
               ((int) (pos->key_part[j].length - field->decimals())) >= 4))
178
177
            keydef[i].seg[j].flag|= HA_SPACE_PACK;
179
178
        }
255
254
    else if (found->zero_pack())
256
255
      recinfo_pos->type= (int) FIELD_SKIP_ZERO;
257
256
    else
258
 
      recinfo_pos->type= (int) ((length <= 3) ?  FIELD_NORMAL : found->type() == DRIZZLE_TYPE_STRING ||
259
 
                                  found->type() == DRIZZLE_TYPE_VAR_STRING ?
 
257
      recinfo_pos->type= (int) ((length <= 3) ?  FIELD_NORMAL : found->type() == DRIZZLE_TYPE_STRING ?
260
258
                                  FIELD_SKIP_ENDSPACE :
261
259
                                  FIELD_SKIP_PRESPACE);
262
260
    if (found->null_ptr)