← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_key.c

  • Committer: Brian Aker
  • Date: 2008-08-01 18:59:55 UTC
  • Revision ID: brian@tangent.org-20080801185955-o1j93r71gd6onvzr
Random key cleanup (it is a friday...)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_key.c
53
53
  uchar *pos;
54
54
  uchar *start;
55
55
  register HA_KEYSEG *keyseg;
56
 
  my_bool is_ft= info->s->keyinfo[keynr].flag & HA_FULLTEXT;
57
56
 
58
57
  start=key;
59
58
  for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type ;keyseg++)
73
72
      *key++=1;                                 /* Not NULL */
74
73
    }
75
74
 
76
 
    char_length= ((!is_ft && cs && cs->mbmaxlen > 1) ? length/cs->mbmaxlen :
 
75
    char_length= ((cs && cs->mbmaxlen > 1) ? length/cs->mbmaxlen :
77
76
                  length);
78
77
 
79
78
    pos= (uchar*) record+keyseg->start;
201
200
{
202
201
  uchar *start_key=key;
203
202
  HA_KEYSEG *keyseg;
204
 
  my_bool is_ft= info->s->keyinfo[keynr].flag & HA_FULLTEXT;
205
203
 
206
204
  /* only key prefixes are supported */
207
205
  assert(((keypart_map+1) & keypart_map) == 0);
224
222
        continue;                                       /* Found NULL */
225
223
      }
226
224
    }
227
 
    char_length= (!is_ft && cs && cs->mbmaxlen > 1) ? length/cs->mbmaxlen : length;
 
225
    char_length= (cs && cs->mbmaxlen > 1) ? length/cs->mbmaxlen : length;
228
226
    pos=old;
229
227
    if (keyseg->flag & HA_SPACE_PACK)
230
228
    {