← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Brian Aker
  • Date: 2011-02-18 06:05:36 UTC
  • mfrom: (2170.5.1 register)
  • Revision ID: brian@tangent.org-20110218060536-lwu25fcilikyzyed
Test removing register.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
134
134
 
135
135
/* functions defined in this file */
136
136
 
137
 
static char **make_char_array(char **old_pos, register uint32_t fields,
 
137
static char **make_char_array(char **old_pos, uint32_t fields,
138
138
                              uint32_t length);
139
139
 
140
140
static unsigned char *read_buffpek_from_file(internal::IO_CACHE *buffer_file,
456
456
 
457
457
/** Make a array of string pointers. */
458
458
 
459
 
static char **make_char_array(char **old_pos, register uint32_t fields,
 
459
static char **make_char_array(char **old_pos, uint32_t fields,
460
460
                              uint32_t length)
461
461
{
462
 
  register char **pos;
 
462
  char **pos;
463
463
  char *char_pos;
464
464
 
465
465
  if (old_pos ||
723
723
    1 Error
724
724
*/
725
725
 
726
 
int SortParam::write_keys(register unsigned char **sort_keys, uint32_t count,
 
726
int SortParam::write_keys(unsigned char **sort_keys, uint32_t count,
727
727
                          internal::IO_CACHE *buffpek_pointers, internal::IO_CACHE *tempfile)
728
728
{
729
729
  buffpek buffpek;
788
788
 
789
789
/** Make a sort-key from record. */
790
790
 
791
 
void SortParam::make_sortkey(register unsigned char *to, unsigned char *ref_pos)
 
791
void SortParam::make_sortkey(unsigned char *to, unsigned char *ref_pos)
792
792
{
793
793
  Field *field;
794
794
  SortField *sort_field;
1021
1021
 
1022
1022
 
1023
1023
/*
1024
 
  Register fields used by sorting in the sorted table's read set
 
1024
  fields used by sorting in the sorted table's read set
1025
1025
*/
1026
1026
 
1027
1027
void SortParam::register_used_fields()
1104
1104
  from_file= t_file ; to_file= &t_file2;
1105
1105
  while (*maxbuffer >= MERGEBUFF2)
1106
1106
  {
1107
 
    register uint32_t i;
 
1107
    uint32_t i;
1108
1108
 
1109
1109
    if (from_file->reinit_io_cache(internal::READ_CACHE,0L,0,0))
1110
1110
    {
1164
1164
 
1165
1165
uint32_t FileSort::read_to_buffer(internal::IO_CACHE *fromfile, buffpek *buffpek_inst, uint32_t rec_length)
1166
1166
{
1167
 
  register uint32_t count;
 
1167
  uint32_t count;
1168
1168
  uint32_t length;
1169
1169
 
1170
1170
  if ((count= (uint32_t) min((ha_rows) buffpek_inst->max_keys,buffpek_inst->count)))
1405
1405
    }
1406
1406
    else
1407
1407
    {
1408
 
      register unsigned char *end;
 
1408
      unsigned char *end;
1409
1409
      strpos= buffpek_inst->key+offset;
1410
1410
      for (end= strpos+buffpek_inst->mem_count*rec_length ;
1411
1411
           strpos != end ;
1476
1476
 
1477
1477
uint32_t FileSort::sortlength(SortField *sortorder, uint32_t s_length, bool *multi_byte_charset)
1478
1478
{
1479
 
  register uint32_t length;
 
1479
  uint32_t length;
1480
1480
  const CHARSET_INFO *cs;
1481
1481
  *multi_byte_charset= 0;
1482
1482