List:Commits« Previous MessageNext Message »
From:Øystein Grøvlen Date:December 13 2010 1:15pm
Subject:Re: bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3259)
WL#1393
View as plain text  
Looks good.  Just one small comment:

On 12/10/10 04:06 PM, Tor Didriksen wrote:
> === modified file 'sql/filesort.cc'
> --- a/sql/filesort.cc	2010-12-09 11:54:39 +0000
> +++ b/sql/filesort.cc	2010-12-10 15:06:03 +0000
> @@ -218,7 +218,8 @@ ha_rows filesort(THD *thd, TABLE *table,
>         !(param.tmp_buffer= (char*) my_malloc(param.sort_length,MYF(MY_WME))))
>       goto err;
>
> -  if (check_if_pq_applicable(&param,&table_sort,
> +  if (param.max_rows != HA_POS_ERROR&&
> +      check_if_pq_applicable(&param,&table_sort,
>                                table, num_rows, memory_available))

With this test, it is no longer necessary to test for HA_POS_ERROR 
within check_if_pq_applicable().  Maybe that test could be replaced with 
an assert?

--
Øystein

Thread
bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3259) WL#1393Tor Didriksen10 Dec
  • Re: bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3259)WL#1393Øystein Grøvlen13 Dec
  • Re: bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3259)WL#1393Jorgen Loland15 Dec