summaryrefslogtreecommitdiff
path: root/mysql-test/r/subselect_no_scache.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-08-18 19:58:51 -0700
committerIgor Babaev <igor@askmonty.org>2013-08-18 19:58:51 -0700
commit4eddb2c221d086d7181ef7ff78bb0e6ce6f3359a (patch)
treed1b3c7ebc6b5149a4111176c53ce112a7585ae21 /mysql-test/r/subselect_no_scache.result
parentb59738a598569ace75be5e63b7ed6ca69afe6ebc (diff)
parent25c152018dceae35bf0d45de46a33a214048128c (diff)
downloadmariadb-git-4eddb2c221d086d7181ef7ff78bb0e6ce6f3359a.tar.gz
Merge 5.3->5.5.
In particular: Merged the patch for bug mdev-4418 from 5.3 into 5.5. Fixed a bug in the patch that should be backported to 5.3.
Diffstat (limited to 'mysql-test/r/subselect_no_scache.result')
-rw-r--r--mysql-test/r/subselect_no_scache.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result
index 2b85a66c124..45443eabe71 100644
--- a/mysql-test/r/subselect_no_scache.result
+++ b/mysql-test/r/subselect_no_scache.result
@@ -1325,7 +1325,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL NULL No tables used
2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
Warnings:
-Note 1003 select <in_optimizer>(0,<exists>(select 1 from dual where (0 = 1))) AS `0 IN (SELECT 1 FROM t1 a)`
+Note 1003 select <in_optimizer>(0,<exists>(select 1 from dual where 0)) AS `0 IN (SELECT 1 FROM t1 a)`
INSERT INTO t1 (pseudo) VALUES ('test1');
SELECT 0 IN (SELECT 1 FROM t1 a);
0 IN (SELECT 1 FROM t1 a)