From 55a8c28c27778d018a145ce25e61bdcda7a764a5 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Sep 2004 19:28:29 +0300 Subject: fixed merged view fields names (BUG#5147) support of merged VIEW over several tables added (WL#1809) mysql-test/r/view.result: merge of VIEW with several tables mysql-test/t/view.test: merge of VIEW with several tables sql/item.cc: renaming Item and restoring item name on cleunup() sql/item.h: renaming Item and restoring item name on cleunup() debug output added sql/item_cmpfunc.h: setup_conds() changed to support two tables lists sql/item_subselect.cc: list of table leaves used instead of local table list for name resolving sql/mysql_priv.h: setup_conds() and setup_tables() changed to support two tables lists sql/opt_sum.cc: list of table leaves used instead of local table list for name resolving sql/sp.cc: setup_tables() changed to support two tables lists sql/sql_base.cc: skip temporary tables in table finding fixed merged view fields names (BUG#5147) sql/sql_delete.cc: setup_conds() and setup_tables() changed to support two tables lists sql/sql_help.cc: setup_tables() changed to support two tables lists sql/sql_insert.cc: setup_tables() changed to support two tables lists name handling support sql/sql_lex.cc: allow view with several tables for MERGE sql/sql_lex.h: new table list sql/sql_load.cc: setup_tables() changed to support two tables lists sql/sql_olap.cc: setup_tables() changed to support two tables lists sql/sql_parse.cc: new list support sql/sql_prepare.cc: new list support sql/sql_select.cc: list of table leaves used instead of local table list for name resolving sql/sql_update.cc: setup_conds() and setup_tables() changed to support two tables lists sql/sql_view.cc: support of MERGED VIEWS with several tables sql/sql_yacc.yy: removed blanks in new code sql/table.cc: fixed setup view code support of merged VIEW over several tables added sql/table.h: fixed merged view fields names (BUG#5147) --- sql/sql_lex.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sql/sql_lex.h') diff --git a/sql/sql_lex.h b/sql/sql_lex.h index d43b1f81f3d..a32b8465a88 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -432,6 +432,7 @@ public: List top_join_list; /* join list of the top level */ List *join_list; /* list for the currently parsed join */ TABLE_LIST *embedding; /* table embedding to the above list */ + TABLE_LIST *leaf_tables; /* list of leaves in join table tree */ const char *type; /* type of select for EXPLAIN */ SQL_LIST order_list; /* ORDER clause */ @@ -650,6 +651,8 @@ typedef struct st_lex */ TABLE_LIST **query_tables_last; TABLE_LIST *proc_table; /* refer to mysql.proc if it was opened by VIEW */ + /* store original leaf_tables for INSERT SELECT and PS/SP */ + TABLE_LIST *leaf_tables_insert; List col_list; List ref_list; -- cgit v1.2.1 From c9497e2365461fb2547a8cfceb33b68a99d7fe0b Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 21 Nov 2004 19:33:49 +0200 Subject: post merge --- sql/sql_lex.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/sql_lex.h') diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 7d72d8ec5e1..6853bab019f 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -710,6 +710,7 @@ typedef struct st_lex uint grant, grant_tot_col, which_columns; uint fk_delete_opt, fk_update_opt, fk_match_option; uint slave_thd_opt; + uint table_count; /* used when usual update transformed in multiupdate */ uint8 describe; uint8 derived_tables; uint8 create_view_algorithm; -- cgit v1.2.1