Hi Jim,
your changeset loses the balance between DBUG_ENTER and DBUG_RETURN :
U-ROWVWADEjas wrote:
> [[...]]
>
> ChangeSet@stripped, 2007-09-04 16:34:34-04:00, jas@rowvwade. +1 -0
> Fix Windows' build problem.
>
> libmysql/libmysql.c@stripped, 2007-09-04 16:34:25-04:00, jas@rowvwade. +3 -3
> Move DBUG_ENTER to first executable line in function so module
> will compile as legitimate C code.
>
> diff -Nrup a/libmysql/libmysql.c b/libmysql/libmysql.c
> --- a/libmysql/libmysql.c 2007-08-25 04:43:10 -04:00
> +++ b/libmysql/libmysql.c 2007-09-04 16:34:25 -04:00
> @@ -4678,13 +4678,13 @@ int cli_read_binary_rows(MYSQL_STMT *stm
> MYSQL_ROWS *cur, **prev_ptr= &result->data;
> NET *net;
>
> - if (!mysql)
> + DBUG_ENTER("cli_read_binary_rows");
> +
> + if (!mysql)
> {
> set_stmt_error(stmt, CR_SERVER_LOST, unknown_sqlstate);
> return 1;
If this path is taken, balance is missing.
IMO, that line should read
DBUG_RETURN(1);
> }
> -
> - DBUG_ENTER("cli_read_binary_rows");
>
> net = &mysql->net;
> mysql= mysql->last_used_con;
>
Regards,
Jörg
--
Joerg Bruehe, Senior Production Engineer
MySQL AB, www.mysql.com
Office: (+49 30) 417 01 487 VoIP: 4464@stripped
