summaryrefslogtreecommitdiff
path: root/mysql-test/r/select.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-09-20 17:47:49 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-09-20 17:47:49 +0300
commitfc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670 (patch)
treed3f4f28b6bb2ffa6e6c4b19e6c03f2e209590171 /mysql-test/r/select.result
parent4cfef2a5a4157269244923637032c21ff67b0161 (diff)
parent96f06f952d087bd47225cc2784edbb0510fad818 (diff)
downloadmariadb-git-fc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670.tar.gz
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'mysql-test/r/select.result')
-rw-r--r--mysql-test/r/select.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 5859bd0fae6..c7156ddae91 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -4784,7 +4784,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t2 system NULL NULL NULL NULL 1 100.00
1 SIMPLE t1 ALL NULL NULL NULL NULL 10 100.00 Using where
Warnings:
-Note 1003 select `test`.`t1`.`a` AS `a`,2 AS `b` from `test`.`t1` where `test`.`t1`.`a` = <cache>(2 + 1 + 1)
+Note 1003 select `test`.`t1`.`a` AS `a`,2 AS `b` from `test`.`t1` where `test`.`t1`.`a` = <cache>(2 + (1 + 1))
SELECT * FROM t2 LEFT JOIN t1 ON a = b + 1;
b a
2 3