diff options
| author | unknown <konstantin@mysql.com> | 2005-07-13 18:05:57 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-13 18:05:57 +0400 |
| commit | 91c97a76fcc6cc24dfbea96e904b2ecf4c968a1a (patch) | |
| tree | f231b6cdd94512d3ff0c59fd85ca05f4b6a46f13 /sql/sql_prepare.cc | |
| parent | 7001961e255dd454fe79311d5721dc9223f662e0 (diff) | |
| parent | 7a0f6d522bda0725f589c18e9214878d90bee2d0 (diff) | |
| download | mariadb-git-91c97a76fcc6cc24dfbea96e904b2ecf4c968a1a.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-11458
into mysql.com:/opt/local/work/mysql-5.0-root
sql/mysql_priv.h:
Auto merged
sql/sql_lex.h:
Auto merged
mysql-test/r/ps.result:
Manual merge.
mysql-test/t/ps.test:
Manual merge.
sql/item.cc:
Manual merge.
sql/item.h:
Manual merge.
sql/item_subselect.h:
Manual merge.
sql/sql_parse.cc:
Manual merge.
sql/sql_prepare.cc:
Manual merge.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 53f706bd0f6..6d11518198c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1825,7 +1825,10 @@ bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length, void init_stmt_after_parse(THD *thd, LEX *lex) { SELECT_LEX *sl= lex->all_selects_list; - + /* + Switch off a temporary flag that prevents evaluation of + subqueries in statement prepare. + */ for (; sl; sl= sl->next_select_in_list()) sl->uncacheable&= ~UNCACHEABLE_PREPARE; } |