summaryrefslogtreecommitdiff
path: root/mysql-test/r/subselect_no_scache.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-03-06 20:46:07 +0100
committerSergei Golubchik <sergii@pisem.net>2012-03-06 20:46:07 +0100
commit18c51eee3557ecc61d69778adb6c78c0fae4d496 (patch)
tree969192b1cc276f574271ceef2106f949de4f749b /mysql-test/r/subselect_no_scache.result
parent68aa3edd1dbedb99efff6ccba6bcb0ddbb6d8fac (diff)
parentf92cfdb8a9ff7f8287239c39ce4735789a23e3df (diff)
downloadmariadb-git-18c51eee3557ecc61d69778adb6c78c0fae4d496.tar.gz
5.3 merge
Diffstat (limited to 'mysql-test/r/subselect_no_scache.result')
-rw-r--r--mysql-test/r/subselect_no_scache.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/subselect_no_scache.result b/mysql-test/r/subselect_no_scache.result
index ec3206c4d90..e85f2ccf1e1 100644
--- a/mysql-test/r/subselect_no_scache.result
+++ b/mysql-test/r/subselect_no_scache.result
@@ -6468,6 +6468,7 @@ SELECT ( SELECT b FROM t2 WHERE b = a OR rand() * 0) FROM t1;
1
NULL
drop table t1,t2,t3;
+set optimizer_switch=@subselect_tmp;
#
# LP BUG#905353 Wrong non-empty result with a constant table,
# aggregate function in subquery, MyISAM or Aria