← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/sort.cc

  • Committer: Mark Atwood
  • Date: 2011-06-16 06:04:05 UTC
  • mfrom: (2318.4.8 refactor7)
  • Revision ID: me@mark.atwood.name-20110616060405-jqxvti75k6bpq741
merge lp:~olafvdspek/drizzle/refactor9

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/sort.cc
156
156
      }
157
157
      while ((maxbuffer= (size_t)(records/(keys-1)+1)) != skr);
158
158
 
159
 
    if ((sort_keys=(unsigned char **)malloc(keys*(sort_length+sizeof(char*)))))
160
 
    {
161
 
      if (my_init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer,
162
 
                             maxbuffer/2))
163
 
      {
164
 
        free((unsigned char*) sort_keys);
165
 
        sort_keys= 0;
166
 
      }
167
 
      else
168
 
        break;
169
 
    }
170
 
    old_memavl=memavl;
 
159
    sort_keys=(unsigned char **)malloc(keys*(sort_length+sizeof(char*)));
 
160
    my_init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer, maxbuffer/2);
 
161
    break;
 
162
    old_memavl=memavl; // todo: remove dead code
171
163
    if ((memavl=memavl/4*3) < MIN_SORT_MEMORY && old_memavl > MIN_SORT_MEMORY)
172
164
      memavl=MIN_SORT_MEMORY;
173
165
  }