diff options
author | unknown <dlenev@mysql.com> | 2005-12-12 14:59:14 +0300 |
---|---|---|
committer | unknown <dlenev@mysql.com> | 2005-12-12 14:59:14 +0300 |
commit | 346694bddf9d42db1c950252decfb10b8ba5a7e4 (patch) | |
tree | 53cb292c31cd2f972827446a8e330ad837c51545 /sql/sp_head.h | |
parent | e8edf40f43faa6d7011341280244f974651e87da (diff) | |
parent | 4d87cf984dde6ca1ae91375375481dfada3d0c85 (diff) | |
download | mariadb-git-346694bddf9d42db1c950252decfb10b8ba5a7e4.tar.gz |
Merge mysql.com:/home/dlenev/src/mysql-5.0-merges
into mysql.com:/home/dlenev/src/mysql-5.1-merges
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql/sp_head.h')
-rw-r--r-- | sql/sp_head.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index a487ffc52fc..d99b600f6b2 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -310,7 +310,8 @@ public: /* Add tables used by routine to the table list. */ bool 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); /* Check if this stored routine contains statements disallowed |