database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Dmitry Shulga
2023-09-05 14:44:52 +07:00
parent b0a43818b4 68a925b325
commit de5dba9ebe
9 changed files with 210 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_base.cc
View File

@ -1944,10 +1944,6 @@ retry_share:
goto err_lock;
}
/* Open view */
if (mysql_make_view(thd, share, table_list, false))
goto err_lock;
/*
This table is a view. Validate its metadata version: in particular,
that it was a view when the statement was prepared.
@ -1955,6 +1951,10 @@ retry_share:
if (check_and_update_table_version(thd, table_list, share))
goto err_lock;
/* Open view */
if (mysql_make_view(thd, share, table_list, false))
goto err_lock;
/* TODO: Don't free this */
tdc_release_share(share);
@ -3908,6 +3908,12 @@ open_and_process_table(THD *thd, TABLE_LIST *tables, uint *counter, uint flags,
if (tables->open_strategy && !tables->table)
goto end;
/* Check and update metadata version of a base table. */
error= check_and_update_table_version(thd, tables, tables->table->s);
if (unlikely(error))
goto end;
error= extend_table_list(thd, tables, prelocking_strategy, has_prelocking_list);
if (unlikely(error))
goto end;
@ -3915,11 +3921,6 @@ open_and_process_table(THD *thd, TABLE_LIST *tables, uint *counter, uint flags,
/* Copy grant information from TABLE_LIST instance to TABLE one. */
tables->table->grant= tables->grant;
/* Check and update metadata version of a base table. */
error= check_and_update_table_version(thd, tables, tables->table->s);
if (unlikely(error))
goto end;
/*
After opening a MERGE table add the children to the query list of
tables, so that they are opened too.