On 11/12/2010 02:40 PM, Jorgen Loland wrote:
> #At file:///export/home/jl208045/mysql/mysql-5.5-bugteam-54812/ based on
> revid:vvaintroub@stripped
>
> 3121 Jorgen Loland 2010-11-12
> Bug#54812: assert in Diagnostics_area::set_ok_status
> during EXPLAIN
Approved with minor cosmetic comment below.
> === modified file 'sql/sql_update.cc'
> --- a/sql/sql_update.cc 2010-10-07 10:01:51 +0000
> +++ b/sql/sql_update.cc 2010-11-12 13:40:43 +0000
> @@ -2064,7 +2064,9 @@ bool multi_update::send_eof()
> Does updates for the last n - 1 tables, returns 0 if ok;
> error takes into account killed status gained in do_updates()
> */
> - int local_error = (table_count) ? do_updates() : 0;
> + int local_error= thd->is_error();
There's some extra whitespace at the end of this line that should
be removed.
--- Jon Olav
