List:Commits« Previous MessageNext Message »
From:Jorgen Loland Date:January 20 2011 1:20pm
Subject:Re: bzr commit into mysql-trunk branch (mattias.jonsson:3532) Bug#59503
View as plain text  
Hi Mattias,

Your new code uses tab-indentation. Please change to spaces. Apart from that, 
the patch looks good.

Is it correct that using_real_indexes is only used by partitioning? If so, you 
could also add to the comment of that variable. Ignore if you're unsure :-)

On 01/20/2011 12:47 PM, Mattias Jonsson wrote:
> #At file:///C:/mysql-bzr/b59503-trunk/ based on
> revid:anders.song@stripped
>
>   3532 Mattias Jonsson	2011-01-20
>        bug#59503: explain extended crash in get_mm_leaf
>
>        The problem was during partitioning pruning, which does not
>        use any real indexes (instead uses the partitioning function)
>        so one must check if real indexes is in use before trying to
>        use them.
>
>      modified:
>        mysql-test/r/partition.result
>        mysql-test/t/partition.test
>        sql/opt_range.cc
...
> === modified file 'sql/opt_range.cc'
> --- a/sql/opt_range.cc	2010-12-29 00:38:59 +0000
> +++ b/sql/opt_range.cc	2011-01-20 11:47:35 +0000
> @@ -5774,7 +5774,8 @@ get_mm_leaf(RANGE_OPT_PARAM *param, Item
>         !(conf_func->compare_collation()->state&  MY_CS_BINSORT&&
>           (type == Item_func::EQUAL_FUNC || type == Item_func::EQ_FUNC)))
>     {
> -    if (param->thd->lex->describe&  DESCRIBE_EXTENDED)
> +    if (param->using_real_indexes&&
> +		param->thd->lex->describe&  DESCRIBE_EXTENDED)

Please use space indentation

>         push_warning_printf(
>                 param->thd,
>                 MYSQL_ERROR::WARN_LEVEL_WARN,
> @@ -5906,7 +5907,8 @@ get_mm_leaf(RANGE_OPT_PARAM *param, Item
>         value->result_type() != STRING_RESULT&&
>         field->cmp_type() != value->result_type())
>     {
> -    if (param->thd->lex->describe&  DESCRIBE_EXTENDED)
> +	  if (param->using_real_indexes&&
> +		  param->thd->lex->describe&  DESCRIBE_EXTENDED)

Please use space indentation

-- 
Jørgen Løland | Senior Software Engineer | +47 73842138
Oracle MySQL
Trondheim, Norway
Thread
bzr commit into mysql-trunk branch (mattias.jonsson:3532) Bug#59503Mattias Jonsson20 Jan
  • Re: bzr commit into mysql-trunk branch (mattias.jonsson:3532) Bug#59503Jorgen Loland20 Jan