summaryrefslogtreecommitdiff
path: root/mysql-test/r/select.result
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-09-28 19:15:58 +0400
committerAlexander Nozdrin <alik@sun.com>2010-09-28 19:15:58 +0400
commit94e726ae3dfaaa36d2dee3f7e0454c8c2be84b25 (patch)
treedefcec65399a33d0e3662cb26c31a567cfbe8584 /mysql-test/r/select.result
parentaa400404397d85ce281a0141ad2c1ab9736f05b9 (diff)
parentd63db001b6b9b33919265efab2b02ee5b043da54 (diff)
downloadmariadb-git-94e726ae3dfaaa36d2dee3f7e0454c8c2be84b25.tar.gz
Auto-merge from mysql-5.5-merge.
Diffstat (limited to 'mysql-test/r/select.result')
-rw-r--r--mysql-test/r/select.result5
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index b1e0f30668d..96979d257f1 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -4430,11 +4430,6 @@ SELECT 1 FROM t1 WHERE a <> 1 AND NOT
ROW(1,a) <=> ROW(1,(SELECT 1 FROM t1))
INTO @var0;
ERROR 21000: Subquery returns more than 1 row
-SELECT 1 FROM t1 WHERE a <> 1 AND NOT
-ROW(a,a) <=> ROW((SELECT 1 FROM t1 WHERE 1=2),(SELECT 1 FROM t1));
-1
-1
-1
DROP TABLE t1;
#
# Bug #48458: simple query tries to allocate enormous amount of