diff options
| author | unknown <dlenev@mysql.com> | 2005-12-07 12:47:25 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-12-07 12:47:25 +0300 |
| commit | 24af7680d4fe70ecb359de6b435d76157efaf98a (patch) | |
| tree | 58da2b1b1437e48f3ad5b672bc3afd7d72d95e21 /sql/sp_head.cc | |
| parent | f095abaa4748c5ad2c302b8697c819d3fbd5de2a (diff) | |
| parent | 361977c0daeac099e96ba83e341d4cdb36af7474 (diff) | |
| download | mariadb-git-24af7680d4fe70ecb359de6b435d76157efaf98a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg11555-2
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
sql/sp.cc:
Manual merge.
sql/sp.h:
Manual merge.
sql/sql_base.cc:
Manual merge.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index fcd220353fc..51286919d29 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -3126,10 +3126,12 @@ sp_head::merge_table_list(THD *thd, TABLE_LIST *table, LEX *lex_for_tmp_check) SYNOPSIS add_used_tables_to_table_list() - thd - thread context - query_tables_last_ptr - (in/out) pointer the next_global member of last - element of the list where tables will be added - (or to its root). + thd [in] Thread context + query_tables_last_ptr [in/out] Pointer to the next_global member of + last element of the list where tables + will be added (or to its root). + belong_to_view [in] Uppermost view which uses this routine, + 0 if none. DESCRIPTION Converts multi-set of tables used by this routine to table list and adds @@ -3144,7 +3146,8 @@ sp_head::merge_table_list(THD *thd, TABLE_LIST *table, LEX *lex_for_tmp_check) bool sp_head::add_used_tables_to_table_list(THD *thd, - TABLE_LIST ***query_tables_last_ptr) + TABLE_LIST ***query_tables_last_ptr, + TABLE_LIST *belong_to_view) { uint i; Query_arena *arena, backup; @@ -3187,6 +3190,7 @@ sp_head::add_used_tables_to_table_list(THD *thd, table->lock_type= stab->lock_type; table->cacheable_table= 1; table->prelocking_placeholder= 1; + table->belong_to_view= belong_to_view; /* Everyting else should be zeroed */ |