← 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: 2009-10-16 10:27:33 UTC
  • mfrom: (1183.1.4 merge)
  • Revision ID: brian@gaz-20091016102733-b10po5oup0hjlilh
Merge Engine changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
454
454
  Table *sort_form;
455
455
  Session *session= current_session;
456
456
  volatile Session::killed_state *killed= &session->killed;
457
 
  handler *file;
 
457
  Cursor *file;
458
458
  MyBitmap *save_read_set, *save_write_set;
459
459
 
460
460
  idx=indexpos=0;
461
461
  error=quick_select=0;
462
462
  sort_form=param->sort_form;
463
 
  file=sort_form->file;
 
463
  file= sort_form->file;
464
464
  ref_length=param->ref_length;
465
465
  ref_pos= ref_buff;
466
466
  quick_select=select && select->quick;
1323
1323
/**
1324
1324
  Calculate length of sort key.
1325
1325
 
1326
 
  @param session                          Thread handler
 
1326
  @param session                          Thread Cursor
1327
1327
  @param sortorder                Order of items to sort
1328
1328
  @param s_length                 Number of items to sort
1329
1329
  @param[out] multi_byte_charset Set to 1 if we are using multi-byte charset