summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2006-03-28 15:06:29 +0400
committerkonstantin@mysql.com <>2006-03-28 15:06:29 +0400
commit71defb7a8020e0797cdc3b7b68c1c96adcb7a4e6 (patch)
treeb8b09a147e82ee710a994bfe0d89df334c4fb965 /sql
parentcc1ee7e48b864387ad8184968f8792f248379d84 (diff)
downloadmariadb-git-71defb7a8020e0797cdc3b7b68c1c96adcb7a4e6.tar.gz
A fix and a test case for Bug#15683 "crash, Function on nested
VIEWs, Prepared statement": we didn't mark the nested views as 'prelockng placeholders' when building the prelocking list. This resulted in these views being processed (merged, materialized) before they are actually used.
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_view.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 2832adc1f8f..39d1ae5c9fb 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -938,6 +938,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table)
tbl->skip_temporary= 1;
tbl->belong_to_view= top_view;
tbl->referencing_view= table;
+ tbl->prelocking_placeholder= table->prelocking_placeholder;
/*
First we fill want_privilege with SELECT_ACL (this is needed for the
tables which belongs to view subqueries and temporary table views,