diff options
author | unknown <konstantin@mysql.com> | 2005-06-08 00:34:53 +0400 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2005-06-08 00:34:53 +0400 |
commit | 936688feb5638a8e11d0de363a05eaced99abdd5 (patch) | |
tree | 45fafa0273fdf02d6120d49c8ab078c18fe54107 /sql/sql_lex.h | |
parent | 0bc3c6221cbaae56ba444e06603c4afbf11f685e (diff) | |
download | mariadb-git-936688feb5638a8e11d0de363a05eaced99abdd5.tar.gz |
A followup patch for Bug#7306 (limit in prepared statements):
don't evaluate subqueries during statement prepare, even if they
are not correlated.
With post-review fixes.
sql/mysql_priv.h:
Add UNCACHEABLE_PREPARE to mark subqueries as non-constant in
mysql_stmt_prepare
sql/sql_lex.cc:
Add a missing assert: noone can call unit::set_limit from
mysql_stmt_prepare.
sql/sql_lex.h:
Comment fixed.
sql/sql_parse.cc:
Mark new SELECT_LEXes as uncacheable if they created during
statement prepare.
sql/sql_prepare.cc:
Switch off the uncacheable flag when prepare is done.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 5022392565c..a6f729d7677 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -303,6 +303,7 @@ public: UNCACHEABLE_RAND UNCACHEABLE_SIDEEFFECT UNCACHEABLE_EXPLAIN + UNCACHEABLE_PREPARE */ uint8 uncacheable; enum sub_select_type linkage; |