summaryrefslogtreecommitdiff
path: root/mysql-test/r/subselect_cache.result
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2013-07-31 17:24:52 +0400
committerSergey Petrunya <psergey@askmonty.org>2013-07-31 17:24:52 +0400
commit04684b7709f55a5a9de9226e834bcfbed05ee5c0 (patch)
tree5771f2c3c0f2401e1eb9f6164ecf71eb0e002b91 /mysql-test/r/subselect_cache.result
parent6fb1786584bc85db84e7ad184d6162d3208068c0 (diff)
downloadmariadb-git-04684b7709f55a5a9de9226e834bcfbed05ee5c0.tar.gz
MDEV-4817: Optimizer fails to optimize expression of the form 'FOO' IS NULL
- Modify the way Item_cond::fix_fields() and Item_cond::eval_not_null_tables() calculate bitmap for Item_cond_or::not_null_tables(): if they see a "... OR inexpensive_const_false_item OR ..." then the item can be ignored. - Updated test results. There can be more warnings produced since parts of WHERE are evaluated more times.
Diffstat (limited to 'mysql-test/r/subselect_cache.result')
-rw-r--r--mysql-test/r/subselect_cache.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/subselect_cache.result b/mysql-test/r/subselect_cache.result
index 7bd10dc11a6..95f935981c2 100644
--- a/mysql-test/r/subselect_cache.result
+++ b/mysql-test/r/subselect_cache.result
@@ -3129,6 +3129,7 @@ WHERE table1 .`col_varchar_key` ) field10
1 NULL f
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'f'
+Warning 1292 Truncated incorrect DOUBLE value: 'f'
SET @@optimizer_switch = 'subquery_cache=on';
/* cache is on */ SELECT COUNT( DISTINCT table2 .`col_int_key` ) , (
SELECT SUBQUERY2_t1 .`col_int_key`
@@ -3144,6 +3145,7 @@ WHERE table1 .`col_varchar_key` ) field10
1 NULL f
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'f'
+Warning 1292 Truncated incorrect DOUBLE value: 'f'
drop table t1,t2,t3,t4;
set @@optimizer_switch= default;
#launchpad BUG#611625