diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-12-18 00:28:38 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-01-19 16:16:03 +0530 |
| commit | 94890a749a217bb831a5c260703d27b0a3e290d4 (patch) | |
| tree | 414b928b6097617e0b6fc22427be155adc73cf41 /sql/sql_show.cc | |
| parent | beaea31ab12ab56ea8a6eb5e99cf82648675ea78 (diff) | |
| download | mariadb-git-94890a749a217bb831a5c260703d27b0a3e290d4.tar.gz | |
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.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 4294157cce3..3e9916816b9 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5058,6 +5058,12 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) continue; } + if (thd->killed == ABORT_QUERY) + { + error= 0; + goto err; + } + DEBUG_SYNC(thd, "before_open_in_get_all_tables"); if (fill_schema_table_by_open(thd, FALSE, table, schema_table, |