← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/key.cc

  • Committer: Brian Aker
  • Date: 2008-07-08 16:53:50 UTC
  • mfrom: (51.1.8 remove-dbug)
  • Revision ID: brian@tangent.org-20080708165350-y246k7585xv56c0m
Merging in Jay's Tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/key.cc
332
332
  Field *field;
333
333
  String tmp;
334
334
  my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
335
 
  DBUG_ENTER("key_unpack");
336
335
 
337
336
  to->length(0);
338
337
  for (key_part=table->key_info[idx].key_part,key_part_end=key_part+
380
379
      to->append(STRING_WITH_LEN("???"));
381
380
  }
382
381
  dbug_tmp_restore_column_map(table->read_set, old_map);
383
 
  DBUG_VOID_RETURN;
 
382
  return;
384
383
}
385
384
 
386
385
 
503
502
  uchar *rec0= key_part->field->ptr - key_part->offset;
504
503
  my_ptrdiff_t first_diff= first_rec - rec0, sec_diff= second_rec - rec0;
505
504
  int result= 0;
506
 
  DBUG_ENTER("key_rec_cmp");
507
505
 
508
506
  do
509
507
  {
527
525
          ; /* Fall through, no NULL fields */
528
526
        else
529
527
        {
530
 
          DBUG_RETURN(+1);
 
528
          return(1);
531
529
        }
532
530
      }
533
531
      else if (!sec_is_null)
534
532
      {
535
 
        DBUG_RETURN(-1);
 
533
        return(-1);
536
534
      }
537
535
      else
538
536
        goto next_loop; /* Both were NULL */
549
547
next_loop:
550
548
    key_part++;
551
549
  } while (!result && ++i < key_parts);
552
 
  DBUG_RETURN(result);
 
550
  return(result);
553
551
}