diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-04-21 14:48:13 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-04-21 15:47:03 +1000 |
| commit | 580cbd18b38b1104da49b6eb4f1c10954d6ae183 (patch) | |
| tree | db93c6da0cb3a7a5797eefc356114fe948781a3e /sql/sql_show.cc | |
| parent | a9adfc0f68f0741f8d924eb5ba7fa440aad69213 (diff) | |
| parent | d7189fbcb4dadf23d615a5f3a26aba1d4e37178f (diff) | |
| download | mariadb-git-580cbd18b38b1104da49b6eb4f1c10954d6ae183.tar.gz | |
Merge branch 10.4 into 10.5
A few of constaint -> constraint
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index bf238a2dd16..3a1613ff025 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5068,7 +5068,8 @@ end: */ DBUG_ASSERT(thd->open_tables == NULL); thd->mdl_context.rollback_to_savepoint(open_tables_state_backup->mdl_system_tables_svp); - thd->clear_error(); + if (!thd->is_fatal_error) + thd->clear_error(); return res; } @@ -5284,6 +5285,8 @@ int get_all_tables(THD *thd, TABLE_LIST *tables, COND *cond) error= 0; goto err; } + if (thd->is_fatal_error) + goto err; DEBUG_SYNC(thd, "before_open_in_get_all_tables"); if (fill_schema_table_by_open(thd, &tmp_mem_root, FALSE, |