← Back to team overview

maria-developers team mailing list archive

Re: [patch 03/11] Fix missing DBUG_RETURN in read_init_file()

 

Hi!

>>>>> "knielsen" == knielsen  <knielsen@xxxxxxxxxxxxxxx> writes:

knielsen> === modified file 'sql/mysqld.cc'
knielsen> ---
knielsen>  sql/mysqld.cc |    4 ++--
knielsen>  1 file changed, 2 insertions(+), 2 deletions(-)

knielsen> Index: sql/mysqld.cc
knielsen> ===================================================================
knielsen> --- sql/mysqld.cc.orig	2009-04-07 13:40:36.000000000 +0200
knielsen> +++ sql/mysqld.cc	2009-04-07 13:42:09.000000000 +0200
knielsen> @@ -4815,10 +4815,10 @@ static bool read_init_file(char *file_na
knielsen>    DBUG_ENTER("read_init_file");
knielsen>    DBUG_PRINT("enter",("name: %s",file_name));
knielsen>    if (!(file=my_fopen(file_name,O_RDONLY,MYF(MY_WME))))
knielsen> -    return(1);
knielsen> +    DBUG_RETURN(1);
knielsen>    bootstrap(file);
knielsen>    (void) my_fclose(file,MYF(MY_WME));
knielsen> -  return 0;
knielsen> +  DBUG_RETURN(0);
knielsen>  }
 
Trivial fix; Always ok to push things like this (after a test compile)

Regards,
Monty



References