← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key.cc

  • Committer: Lee Bieber
  • Date: 2011-02-18 23:49:00 UTC
  • mfrom: (2182.1.4 build)
  • Revision ID: kalebral@gmail.com-20110218234900-7zxzvw9x7e7zwflr
Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization 
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/key.cc
64
64
int find_ref_key(KeyInfo *key, uint32_t key_count, unsigned char *record, Field *field,
65
65
                 uint32_t *key_length, uint32_t *keypart)
66
66
{
67
 
  register int i;
68
 
  register KeyInfo *key_info;
 
67
  int i;
 
68
  KeyInfo *key_info;
69
69
  uint32_t fieldpos;
70
70
 
71
71
  fieldpos= field->offset(record);
450
450
    if (key_part->null_bit)
451
451
    {
452
452
      /* This key part allows null values; NULL is lower than everything */
453
 
      register bool field_is_null= key_part->field->is_null();
 
453
      bool field_is_null= key_part->field->is_null();
454
454
      if (*key)                                 // If range key is null
455
455
      {
456
456
        /* the range is expecting a null value */