summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-12-12 13:55:33 -0800
committerIgor Babaev <igor@askmonty.org>2013-12-12 13:55:33 -0800
commit3ec4296ec413e866c3efabc8dfa94172ad5f7c04 (patch)
treec34f3306a1671c4f672732bdc6a42133e080d5d3 /sql/sql_lex.h
parentfde2777b2722a2b81f995c74e74cc3e47c0f8788 (diff)
downloadmariadb-git-3ec4296ec413e866c3efabc8dfa94172ad5f7c04.tar.gz
Fixed bug mdev-5410.
The fix for bug #27937 was incomplete: it did not handle correctly the queries containing UNION with global ORDER BY in subselects.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 4b4496a7df8..d5639724d5f 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -584,7 +584,7 @@ public:
void print(String *str, enum_query_type query_type);
bool add_fake_select_lex(THD *thd);
- void init_prepare_fake_select_lex(THD *thd);
+ void init_prepare_fake_select_lex(THD *thd, bool first_execution);
inline bool is_prepared() { return prepared; }
bool change_result(select_result_interceptor *result,
select_result_interceptor *old_result);