diff options
| author | Oleksandr Byelkin <sanja@askmonty.org> | 2011-05-04 18:08:58 +0300 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@askmonty.org> | 2011-05-04 18:08:58 +0300 |
| commit | 7b797fe66d7167a8f5cbb071a06a640a627f2186 (patch) | |
| tree | d3179754339e87fbe7e6c4cf1daaa59499055d88 /mysql-test/t/explain.test | |
| parent | 0278b06e6b065349aa791d01787dff53e987806f (diff) | |
| download | mariadb-git-7b797fe66d7167a8f5cbb071a06a640a627f2186.tar.gz | |
Moving max/min optimization from prepare to optimization phase. MWL#148
mysql-test/r/explain.result:
fixed results (new item)
mysql-test/r/subselect.result:
fixed results (new item)
mysql-test/r/subselect_no_mat.result:
fixed results (new item)
mysql-test/r/subselect_no_opts.result:
fixed results (new item)
mysql-test/r/subselect_no_semijoin.result:
Fixed results (new item)
mysql-test/suite/pbxt/r/subselect.result:
Fixed results (new item)
mysql-test/t/explain.test:
Fixed results (correct behaviour)
sql/item_cmpfunc.cc:
Pass through for max/min
sql/item_subselect.cc:
moving max/min
sql/item_subselect.h:
moving max/min
sql/mysql_priv.h:
new uncacheble flags added
sql/opt_subselect.cc:
maxmin moved.
sql/opt_subselect.h:
New function for maxmin.
sql/sql_class.h:
debug code
sql/sql_lex.cc:
Fixed flags.
Limit setting fixed.
sql/sql_lex.h:
2 new flags.
sql/sql_select.cc:
Prepare divided on 2 function to be able recollect some info after transformation.
sql/sql_select.h:
Prepare divided on 2 functions.
Diffstat (limited to 'mysql-test/t/explain.test')
| -rw-r--r-- | mysql-test/t/explain.test | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/t/explain.test b/mysql-test/t/explain.test index c6c30b58341..38d33d44ed2 100644 --- a/mysql-test/t/explain.test +++ b/mysql-test/t/explain.test @@ -158,7 +158,10 @@ SELECT @@session.sql_mode INTO @old_sql_mode; SET SESSION sql_mode='ONLY_FULL_GROUP_BY'; # EXPLAIN EXTENDED (with subselect). used to crash. should give NOTICE. ---error ER_MIX_OF_GROUP_FUNC_AND_FIELDS +# Before moving max/min optimization to optimize phase this statement +# generated error, but as far as original query do not contain aggregate +# function user should not see error +# --error ER_MIX_OF_GROUP_FUNC_AND_FIELDS EXPLAIN EXTENDED SELECT 1 FROM t1 WHERE f1 > ALL( SELECT t.f1 FROM t1,t1 AS t ); SHOW WARNINGS; |