diff options
author | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
commit | db260b19e3edb9e153abf784711a3ae13e40db4a (patch) | |
tree | 4a9d9e50072d36ee917a570f8bf83a0117e971db /mysql-test/t/udf.test | |
parent | 0df8279c468235f4feaf9eb25aa2beb5032ee1dc (diff) | |
parent | 4a458290441937661136c73afa61393a6634f7b0 (diff) | |
download | mariadb-git-db260b19e3edb9e153abf784711a3ae13e40db4a.tar.gz |
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'mysql-test/t/udf.test')
-rw-r--r-- | mysql-test/t/udf.test | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/t/udf.test b/mysql-test/t/udf.test index e9ae1a31079..7bf252040e5 100644 --- a/mysql-test/t/udf.test +++ b/mysql-test/t/udf.test @@ -436,4 +436,16 @@ SELECT * FROM t2 WHERE a = sequence(); DROP FUNCTION sequence; DROP TABLE t1,t2; +--echo # +--echo # Bug#46259: 5.0.83 -> 5.1.36, query doesn't work +--echo # +CREATE TABLE t1 ( a INT ); + +INSERT INTO t1 VALUES (1), (2), (3); + +SELECT IF( a = 1, a, a ) AS `b` FROM t1 ORDER BY field( `b` + 1, 1 ); +SELECT IF( a = 1, a, a ) AS `b` FROM t1 ORDER BY field( `b`, 1 ); + +DROP TABLE t1; + --echo End of 5.0 tests. |