On 5/25/11 12:58 PM, Andrei Elkin wrote:
> === modified file 'sql/sql_base.cc'
> --- a/sql/sql_base.cc 2011-05-25 07:36:36 +0000
> +++ b/sql/sql_base.cc 2011-05-25 15:58:07 +0000
> @@ -125,7 +125,7 @@ static void init_tdc_psi_keys(void)
> }
> #endif /* HAVE_PSI_INTERFACE */
>
> -static int32 incr_slave_open_temp_tables(THD *thd, int inc)
> +static void incr_slave_open_temp_tables(THD *thd, int inc)
> {
> int32 ret;
>
There is a return statement in the function, that also needs to be
removed together with the ret variable. I suspect compiler warnings in
your environment are being ignored. Please, build with compiler warnings
enabled.
Also, I suggest you also implement the incr_ to inc_ rename. Throughout
the code base the inc abbreviation of increment is used instead of incr:
~/mysql-5.5$ grep --exclude-dir=tests -r incr_ * | wc -l
0
~/mysql-5.5$ grep --exclude-dir=tests -r inc_ * | wc -l
890
Consistency in naming and abbreviation is important.
