maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Rucha!

On Dec 21, Rucha Deodhar wrote:
> revision-id: ab7092a415f (mariadb-10.2.31-584-gab7092a415f)
> parent(s): 9b30212f15e
> author: Rucha Deodhar <rucha.deodhar@xxxxxxxxxxx>
> committer: Rucha Deodhar <rucha.deodhar@xxxxxxxxxxx>
> timestamp: 2020-12-18 10:20:20 +0530
> message:
> 
> MDEV-24179: Assertion `m_status == DA_ERROR || m_status == DA_OK ||
> m_status == DA_OK_BULK' failed in Diagnostics_area::message()
> 
> Analysis: Assertion failure happens because we reach the maximum limit to
> examine rows.
> Fix: Return the error state.
> 
> diff --git a/sql/sql_show.cc b/sql/sql_show.cc
> index 5544c765775..73b7a84fae1 100644
> --- a/sql/sql_show.cc
> +++ b/sql/sql_show.cc
> @@ -5046,6 +5046,12 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond)
>                  continue;
>              }
>  
> +            if (thd->killed == ABORT_QUERY)
> +            {
> +              error= 0;
> +              goto err;
> +            }
> +

you already have exactly the same if() few lines below.
may be it shouldn't be duplicated, but moved down to the err:
label?

>              DEBUG_SYNC(thd, "before_open_in_get_all_tables");
>              if (fill_schema_table_by_open(thd, FALSE,
>                                            table, schema_table,

Regards,
Sergei
VP of MariaDB Server Engineering
and security@xxxxxxxxxxx