List:Commits« Previous MessageNext Message »
From:Sergey Petrunia Date:November 16 2008 4:40pm
Subject:Re: bzr commit into mysql-5.0-bugteam branch (holyfoot:2711) Bug#31435
View as plain text  
Hi Alexey,

Please
* add a testcase 
* mention in the bugdb entry that the crash part has been fixed by the fix for
  BUG#32125 and you're just removing the warning.

On Tue, Nov 11, 2008 at 02:53:35PM +0400, Alexey Botchkov wrote:
> #At file:///home/hf/work/mysql_common/31435/
> 
>  2711 Alexey Botchkov	2008-11-11
>       Bug#31435 ha_innodb.cc:3983: ulint
> convert_search_mode_to_innobase(ha_rkey_function): Asse 
>           I think we don't need to issue an error statement in the
> convert_search_mode_to_innobase().
>           Returning the PAGE_CUR_UNSUPP value is enough as allows to handle this
>           case depending on the requirements.
Please remove the "I think we don't..." part as it makes it unclear what
change has been made by the patch.

>       per-file comments:
>         sql/ha_innodb.cc 
>       Bug#31435 ha_innodb.cc:3983: ulint
> convert_search_mode_to_innobase(ha_rkey_function): Asse 
>            no error issued in convert_search_mode_to_innobase.
>            ha_innobase::records_in_range() returns HA_POS_ERROR if search mode isn't
> supported.
> modified:
>   sql/ha_innodb.cc
> 
> === modified file 'sql/ha_innodb.cc'
> --- a/sql/ha_innodb.cc	2008-07-31 21:47:57 +0000
> +++ b/sql/ha_innodb.cc	2008-11-11 10:42:32 +0000
> @@ -3723,7 +3723,6 @@ convert_search_mode_to_innobase(
>  		case HA_READ_MBR_WITHIN:
>  		case HA_READ_MBR_DISJOINT:
>  		case HA_READ_MBR_EQUAL:
> -			my_error(ER_TABLE_CANT_HANDLE_SPKEYS, MYF(0));
>  			return(PAGE_CUR_UNSUPP);
>  		/* do not use "default:" in order to produce a gcc warning:
>  		enumeration value '...' not handled in switch
> @@ -5204,7 +5203,7 @@ ha_innobase::records_in_range(
>  						      mode2);
>  	} else {
>  
> -		n_rows = 0;
> +		n_rows = HA_POS_ERROR;
>  	}
>  
>  	dtuple_free_for_mysql(heap1);
 
Ok to push after the above is addressed.

BR
 Sergey
-- 
Sergey Petrunia, Lead Software Engineer
MySQL AB, www.mysql.com
Office: N/A
Blog: http://s.petrunia.net/blog
Thread
bzr commit into mysql-5.0-bugteam branch (holyfoot:2711) Bug#31435Alexey Botchkov11 Nov
  • Re: bzr commit into mysql-5.0-bugteam branch (holyfoot:2711) Bug#31435Sergey Petrunia16 Nov