Commit 985805ce authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 


sql/filesort.cc:
  Auto merged
parents 96f64b44 896cdbe5

sql/filesort.cc

+3 −0
Original line number Diff line number Diff line
@@ -809,7 +809,10 @@ int merge_many_buff(SORTPARAM *param, uchar *sort_buffer, 
  }

  close_cached_file(to_file);			// This holds old result

  if (to_file == t_file)

  {

    *t_file=t_file2;				// Copy result file

    setup_io_cache(t_file);

  }



  DBUG_RETURN(*maxbuffer >= MERGEBUFF2);	/* Return 1 if interrupted */

} /* merge_many_buff */