1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the bug mdev-13166.

Browse Source 
This patch corrects the fix for mdev-12845.
This commit is contained in:
Igor Babaev 2017-06-26 12:16:04 -07:00
parent 6d0aed42c5
commit 02655a91cf
3 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mysql-test/r/derived_cond_pushdown.result
View File

@ -8672,3 +8672,40 @@ EXPLAIN
} }
drop view v1,v2,v3; drop view v1,v2,v3;
drop table t1,t2; drop table t1,t2;
#
# MDEV-13166: pushdown from merged derived
#
CREATE TABLE t1 (i int) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
CREATE VIEW v1 AS SELECT MAX(i) AS f FROM t1;
SELECT * FROM ( SELECT * FROM v1 ) AS sq WHERE f > 0;
f
2
explain format=json SELECT * FROM ( SELECT * FROM v1 ) AS sq WHERE f > 0;
EXPLAIN
{
"query_block": {
"select_id": 1,
"table": {
"table_name": "<derived3>",
"access_type": "ALL",
"rows": 2,
"filtered": 100,
"attached_condition": "v1.f > 0",
"materialized": {
"query_block": {
"select_id": 3,
"having_condition": "f > 0",
"table": {
"table_name": "t1",
"access_type": "ALL",
"rows": 2,
"filtered": 100
}
}
}
}
}
}
DROP VIEW v1;
DROP TABLE t1;

17
mysql-test/t/derived_cond_pushdown.test
View File

@ -1509,3 +1509,20 @@ eval explain format=json $q4;
drop view v1,v2,v3; drop view v1,v2,v3;
drop table t1,t2; drop table t1,t2;
--echo #
--echo # MDEV-13166: pushdown from merged derived
--echo #
CREATE TABLE t1 (i int) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1),(2);
CREATE VIEW v1 AS SELECT MAX(i) AS f FROM t1;
let $q=
SELECT * FROM ( SELECT * FROM v1 ) AS sq WHERE f > 0;
eval $q;
eval explain format=json $q;
DROP VIEW v1;
DROP TABLE t1;

5
sql/item.cc
View File

@ -7173,9 +7173,8 @@ Item *Item_direct_view_ref::derived_field_transformer_for_having(THD *thd,
{ {
st_select_lex *sel= (st_select_lex *)arg; st_select_lex *sel= (st_select_lex *)arg;
table_map tab_map= sel->master_unit()->derived->table->map; table_map tab_map= sel->master_unit()->derived->table->map;
if (item_equal && !(item_equal->used_tables() & tab_map)) if ((item_equal && !(item_equal->used_tables() & tab_map)) ||
return this; !item_equal)
if (!item_equal && used_tables() != tab_map)
return this; return this;
return get_field_item_for_having(thd, this, sel); return get_field_item_for_having(thd, this, sel);
} }