diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-30 11:19:09 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-30 11:19:09 +0400 |
| commit | ccf0277e7e9dedefb5ba2418fb0e797f2ef709b7 (patch) | |
| tree | 39b54fdf566283b7cf5ae4f23030372d4071db54 /mysql-test | |
| parent | b5bd54fa4622e110f88c13c6ea8589780d6802f7 (diff) | |
| parent | 36e234a80a11edac3615079d5e384a6cbcb23739 (diff) | |
| download | mariadb-git-ccf0277e7e9dedefb5ba2418fb0e797f2ef709b7.tar.gz | |
Automerge.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_group.result | 11 | ||||
| -rw-r--r-- | mysql-test/t/func_group.test | 14 |
2 files changed, 25 insertions, 0 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index b36f561578b..606f879b47f 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -1713,4 +1713,15 @@ f1 f2 f3 f4 f1 = f2 NULL NULL NULL NULL NULL drop table t1; # +# Bug #54465: assert: field_types == 0 || field_types[field_pos] == +# MYSQL_TYPE_LONGLONG +# +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1), (2); +SELECT MAX((SELECT 1 FROM t1 ORDER BY @var LIMIT 1)) m FROM t1 t2, t1 +ORDER BY t1.a; +m +1 +DROP TABLE t1; +# End of 5.1 tests diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test index 6dbc8a05789..72a78f612a2 100644 --- a/mysql-test/t/func_group.test +++ b/mysql-test/t/func_group.test @@ -1082,6 +1082,20 @@ select a.f1 as a, b.f4 as b, a.f1 > b.f4 as gt, from t1 a, t1 b; select *, f1 = f2 from t1; drop table t1; + +--echo # +--echo # Bug #54465: assert: field_types == 0 || field_types[field_pos] == +--echo # MYSQL_TYPE_LONGLONG +--echo # + +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1), (2); + +SELECT MAX((SELECT 1 FROM t1 ORDER BY @var LIMIT 1)) m FROM t1 t2, t1 + ORDER BY t1.a; + +DROP TABLE t1; + --echo # --echo End of 5.1 tests |