database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2025-04-21 11:23:11 +02:00
parent 7d9660ed93 a135551569
commit 20b818f45e
40 changed files with 446 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/table.cc
View File

@@ -6360,9 +6360,9 @@ bool TABLE_LIST::prep_check_option(THD *thd, uint8 check_opt_type)
@pre This method can be called only if there is an error.
*/
void TABLE_LIST::hide_view_error(THD *thd)
void TABLE_LIST::replace_view_error_with_generic(THD *thd)
{
if ((thd->killed && !thd->is_error())|| thd->get_internal_handler())
if ((thd->killed && !thd->is_error()) || thd->get_internal_handler())
return;
/* Hide "Unknown column" or "Unknown function" error */
DBUG_ASSERT(thd->is_error());