← 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 20:54:55 UTC
  • mfrom: (243 drizzle)
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 244.
  • Revision ID: monty@inaugust.com-20080731205455-w5c7bplk91v2o1qb
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ha_myisam.cc
172
172
          /* No blobs here */
173
173
          if (j == 0)
174
174
            keydef[i].flag|= HA_PACK_KEY;
175
 
          if ((field->type() == DRIZZLE_TYPE_STRING ||
176
 
               ((int) (pos->key_part[j].length - field->decimals())) >= 4))
 
175
          if ((((int) (pos->key_part[j].length - field->decimals())) >= 4))
177
176
            keydef[i].seg[j].flag|= HA_SPACE_PACK;
178
177
        }
179
178
        else if (j == 0 && (!(pos->flags & HA_NOSAME) || pos->key_length > 16))
254
253
    else if (found->zero_pack())
255
254
      recinfo_pos->type= (int) FIELD_SKIP_ZERO;
256
255
    else
257
 
      recinfo_pos->type= (int) ((length <= 3) ?  FIELD_NORMAL : found->type() == DRIZZLE_TYPE_STRING ?
258
 
                                  FIELD_SKIP_ENDSPACE :
259
 
                                  FIELD_SKIP_PRESPACE);
 
256
      recinfo_pos->type= (int) ((length <= 3) ?  FIELD_NORMAL : FIELD_SKIP_PRESPACE);
260
257
    if (found->null_ptr)
261
258
    {
262
259
      recinfo_pos->null_bit= found->null_bit;