diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2011-08-09 11:42:07 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2011-08-09 11:42:07 +0400 |
| commit | c8c2daf15b6f1841b20f44e8f767be9f05b3f47c (patch) | |
| tree | 183294dd1b6ee36bf961c7155e9112b20933fc54 /mysql-test/r | |
| parent | 56729b859be51e744084602b5c5cd623f8473c6a (diff) | |
| parent | 7e8d625b79f1ad3b3849c11616519cc86f1c07b0 (diff) | |
| download | mariadb-git-c8c2daf15b6f1841b20f44e8f767be9f05b3f47c.tar.gz | |
Manual merge from mysql-5.1.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_time.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/sp.result | 21 |
2 files changed, 26 insertions, 1 deletions
diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result index 63744d4ef29..68c1e667440 100644 --- a/mysql-test/r/func_time.result +++ b/mysql-test/r/func_time.result @@ -1426,4 +1426,10 @@ NULL SELECT WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1); WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1) NULL +# +# Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0, +# +DO WEEK((DATE_ADD((CAST(0 AS DATE)), INTERVAL 1 YEAR_MONTH)), 5); +Warnings: +Warning 1292 Incorrect datetime value: '0' End of 5.1 tests diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index c47263b77df..f5ed4fbd901 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -7055,7 +7055,7 @@ DROP PROCEDURE p2; DROP PROCEDURE p5; # # Bug#11840395 (formerly known as bug#60347): -# The string "versiondata" seems to be 'leaking' into the schema name space +# The string "versiondata" seems # to be 'leaking' into the schema name space # DROP DATABASE IF EXISTS mixedCaseDbName; @@ -7068,6 +7068,25 @@ select mixedCaseDbName.tryMyFunc(); mixedCaseDbName.tryMyFunc() IT WORKS DROP DATABASE mixedCaseDbName; +# +# Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUNCTION IN WHERE C +# +CREATE TABLE t1 (a INT, b INT, KEY(b)); +CREATE TABLE t2 (c INT, d INT, KEY(c)); +INSERT INTO t1 VALUES (1,1),(1,1),(1,2); +INSERT INTO t2 VALUES (1,1),(1,2); +CREATE FUNCTION f1() RETURNS INT DETERMINISTIC +BEGIN +DECLARE a int; +-- SQL statement inside +SELECT 1 INTO a; +RETURN a; +END $ +SELECT COUNT(DISTINCT d) FROM t1, t2 WHERE a = c AND b = f1(); +COUNT(DISTINCT d) +2 +DROP FUNCTION f1; +DROP TABLE t1, t2; # ------------------------------------------------------------------ # -- End of 5.1 tests # ------------------------------------------------------------------ |