diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-14 13:46:00 +0300 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-14 13:46:00 +0300 |
| commit | e6bf102466847e992c8cec894b7ef6bb7a971c8b (patch) | |
| tree | fefb04085998222a7c9fcd629b204667e76e3a20 /mysql-test/r | |
| parent | 8d311a855164416744c35742a3e1368c49ca6c1a (diff) | |
| parent | fcb83cbf15653bbed15936d8eafb4fc7de3e743b (diff) | |
| download | mariadb-git-e6bf102466847e992c8cec894b7ef6bb7a971c8b.tar.gz | |
5.1-bugteam->5.5-bugteam merge
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/derived.result | 11 | ||||
| -rw-r--r-- | mysql-test/r/multi_update.result | 11 | ||||
| -rw-r--r-- | mysql-test/r/view.result | 13 |
3 files changed, 35 insertions, 0 deletions
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index 53cd89c13c1..d5a0c320d60 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -400,4 +400,15 @@ SELECT 0 FROM (SELECT 0) t61; 0 0 +# +# A nested materialized derived table is used before being populated. +# (addon for bug#19077) +# +CREATE TABLE t1 (i INT, j BIGINT); +INSERT INTO t1 VALUES (1, 2), (2, 2), (3, 2); +SELECT * FROM (SELECT MIN(i) FROM t1 +WHERE j = SUBSTRING('12', (SELECT * FROM (SELECT MIN(j) FROM t1) t2))) t3; +MIN(i) +1 +DROP TABLE t1; # End of 5.0 tests diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 07a92e2abf0..e36bef1f338 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -669,4 +669,15 @@ Error 1242 Subquery returns more than 1 row Error 1242 Subquery returns more than 1 row DROP TABLE t1, t2, t3; SET SESSION sql_safe_updates = DEFAULT; +# +# Bug#52157 various crashes and assertions with multi-table update, stored function +# +CREATE FUNCTION f1 () RETURNS BLOB RETURN 1; +CREATE TABLE t1 (f1 DATE); +INSERT INTO t1 VALUES('2001-01-01'); +UPDATE (SELECT 1 FROM t1 WHERE f1 = (SELECT f1() FROM t1)) x, t1 SET f1 = 1; +Warnings: +Warning 1292 Truncated incorrect datetime value: '1' +DROP FUNCTION f1; +DROP TABLE t1; end of tests diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 8d39b4e596b..fdeed10701d 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -3999,6 +3999,19 @@ CREATE VIEW v1 AS SELECT 1 from t1 WHERE t1.b <=> (SELECT a FROM t1 WHERE a < SOME(SELECT '1')); DROP VIEW v1; DROP TABLE t1; +# +# Bug#57703 create view cause Assertion failed: 0, file .\item_subselect.cc, line 846 +# +CREATE TABLE t1(a int); +CREATE VIEW v1 AS SELECT 1 FROM t1 GROUP BY +SUBSTRING(1 FROM (SELECT 3 FROM t1 WHERE a >= ANY(SELECT 1))); +DROP VIEW v1; +DROP TABLE t1; +# +# Bug#57352 valgrind warnings when creating view +# +CREATE VIEW v1 AS SELECT 1 IN (1 LIKE 2,0) AS f; +DROP VIEW v1; # ----------------------------------------------------------------- # -- End of 5.1 tests. # ----------------------------------------------------------------- |