← Back to branch summary

~mysql/mysql-server/mysql-6.0

« back to all changes in this revision

Viewing changes to sql/filesort.cc

  • Committer: monty at mysql
  • Date: 2002-07-23 15:31:22 UTC
  • mto: (1110.1.7)
  • mto: This revision was merged to the branch mainline in revision 1116.
  • Revision ID: sp1r-monty@mashka.mysql.fi-20020723153122-09736
New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/filesort.cc
318
318
      file->extra(HA_EXTRA_KEYREAD);    // QQ is removed
319
319
    next_pos=(byte*) 0;                 /* Find records in sequence */
320
320
    file->rnd_init();
321
 
    file->extra(HA_EXTRA_CACHE);        /* Quicker reads */
 
321
    file->extra_opt(HA_EXTRA_CACHE,
 
322
                    current_thd->variables.read_buff_size);
322
323
  }
323
324
 
324
325
  for (;;)
920
921
    if (sortorder->field)
921
922
    {
922
923
      if (sortorder->field->type() == FIELD_TYPE_BLOB)
923
 
        sortorder->length= thd->variables.max_item_sort_length;
 
924
        sortorder->length= thd->variables.max_sort_length;
924
925
      else
925
926
      {
926
927
        sortorder->length=sortorder->field->pack_length();
956
957
      if (sortorder->item->maybe_null)
957
958
        length++;                               // Place for NULL marker
958
959
    }
959
 
    set_if_smaller(sortorder->length, thd->variables.max_item_sort_length);
 
960
    set_if_smaller(sortorder->length, thd->variables.max_sort_length);
960
961
    length+=sortorder->length;
961
962
  }
962
963
  sortorder->field= (Field*) 0;                 // end marker