← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Andrew Hutchings
  • Date: 2010-10-20 15:31:27 UTC
  • mto: This revision was merged to the branch mainline in revision 1907.
  • Revision ID: andrew@linuxjedi.co.uk-20101020153127-w9djuz9omzezg2kz
Add error message for global sort buffer constraint

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
268
268
  allocated_sort_memory= param.keys * param.rec_length;
269
269
  if (not global_sort_buffer.add(allocated_sort_memory))
270
270
  {
271
 
    std::cerr << "Global buffer hit!" << std::endl;
272
 
    my_error(ER_OUT_OF_SORTMEMORY, MYF(ME_ERROR+ME_WAITTANG));
 
271
    my_error(ER_OUT_OF_GLOBAL_SORTMEMORY, MYF(ME_ERROR+ME_WAITTANG));
273
272
    goto err;
274
273
  }
275
274