summaryrefslogtreecommitdiff
path: root/mysql-test/r/insert.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/insert.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/insert.result')
-rw-r--r--mysql-test/r/insert.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index 7110f541fb7..a722ab8d97f 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -663,9 +663,10 @@ Warning 1365 Division by 0
Warning 1048 Column 'data' cannot be null
update t1 set data='envelope' where 1/0 or 1;
affected rows: 2
-info: Rows matched: 2 Changed: 2 Warnings: 3
+info: Rows matched: 2 Changed: 2 Warnings: 4
Warnings:
Warning 1365 Division by 0
+Warning 1365 Division by 0
Warning 1265 Data truncated for column 'data' at row 1
Warning 1265 Data truncated for column 'data' at row 2
insert t1 (data) values (default), (1/0), ('dead beef');