← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Andrew Hutchings
  • Date: 2011-01-04 20:16:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2057.
  • Revision ID: andrew@linuxjedi.co.uk-20110104201655-fm6splh5wqpv8wnb
Revert join_cache buffer cleanup, causes valgrind problems and as much as I don't like it I think the current implementation seems to work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
1220
1220
  select= 0;
1221
1221
  delete quick;
1222
1222
  quick= 0;
1223
 
  if (not cache.buff.empty())
 
1223
  if (cache.buff)
1224
1224
  {
1225
 
    size_t size= cache.buff.size();
 
1225
    size_t size= cache.end - cache.buff;
1226
1226
    global_join_buffer.sub(size);
1227
 
    cache.buff.clear();
 
1227
    free(cache.buff);
1228
1228
  }
 
1229
  cache.buff= 0;
1229
1230
  limit= 0;
1230
1231
  if (table)
1231
1232
  {