summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <gluh@mysql.com>2005-05-07 12:21:48 +0000
committerunknown <gluh@mysql.com>2005-05-07 12:21:48 +0000
commit8ed5d70f6eac85e384127e0b346444e4930812d6 (patch)
treee171f4065ee957453c3df73f2e03da6c39dd277f /sql
parent0228f897259751242398164dd4be6689146b8377 (diff)
parente4c24674433f699e8fa082abd3df0d13f5529e1f (diff)
downloadmariadb-git-8ed5d70f6eac85e384127e0b346444e4930812d6.tar.gz
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897 sql/sql_table.cc: Auto merged
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_table.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 6fcde27b537..bbe7c53147b 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2344,6 +2344,13 @@ send_result_message:
}
close_thread_tables(thd);
table->table=0; // For query cache
+ /*
+ thd->lex->derived_tables may be set to non zero value if we open
+ a view. It is necessary to clear thd->lex->derived_tables flag
+ to prevent processing of derived tables during next open_and_lock_tables
+ if next table is a real table.
+ */
+ thd->lex->derived_tables= 0;
if (protocol->write())
goto err;
}