diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 19:00:33 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-09-09 19:00:33 +0400 |
| commit | 56d29401867b21133bd4a3ba9644e2cb78291f97 (patch) | |
| tree | 20b533d22ea39c933ac382d5309f7502783298e9 /mysql-test/r/select.result | |
| parent | 95362e0da87951f921e0700cd1237d00e52405fc (diff) | |
| parent | da7646b64c7e76930e05c0235c724872416ba1dc (diff) | |
| download | mariadb-git-56d29401867b21133bd4a3ba9644e2cb78291f97.tar.gz | |
Manual merge of the fix for bug #54190 and the addendum patch
to 5.5 (removed one test case as it is no longer valid).
mysql-test/r/select.result:
Removed a part of the test case for bug#48291 since it is not
valid anymore. The comments for the removed part were actually
describing a side-effect from the problem addressed by the
addendum patch for bug #54190.
mysql-test/t/select.test:
Removed a part of the test case for bug#48291 since it is not
valid anymore. The comments for the removed part were actually
describing a side-effect from the problem addressed by the
addendum patch for bug #54190.
Diffstat (limited to 'mysql-test/r/select.result')
| -rw-r--r-- | mysql-test/r/select.result | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index e8628d72a46..4ec7a72d7c5 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 |