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

fixed merged view fields names (BUG#5147)

Browse Source 
support of merged VIEW over several tables added (WL#1809)
This commit is contained in:
bell@sanja.is.com.ua
2004-09-14 19:28:29 +03:00
parent 31379fbebe
commit f797298fc5
25 changed files with 599 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_delete.cc
View File

@ -284,8 +284,8 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds)
SELECT_LEX *select_lex= &thd->lex->select_lex;
DBUG_ENTER("mysql_prepare_delete");
if (setup_tables(thd, table_list, conds) ||
setup_conds(thd, table_list, conds) ||
if (setup_tables(thd, table_list, conds, &select_lex->leaf_tables, 0) ||
setup_conds(thd, table_list, select_lex->leaf_tables, conds) ||
setup_ftfuncs(select_lex))
DBUG_RETURN(-1);
if (!table_list->updatable || check_key_in_view(thd, table_list))
@ -341,7 +341,8 @@ int mysql_multi_delete_prepare(THD *thd)
lex->query_tables also point on local list of DELETE SELECT_LEX
*/
if (setup_tables(thd, lex->query_tables, &lex->select_lex.where))
if (setup_tables(thd, lex->query_tables, &lex->select_lex.where,
&lex->select_lex.leaf_tables, 0))
DBUG_RETURN(-1);
/* Fix tables-to-be-deleted-from list to point at opened tables */