diff options
author | unknown <sanja@montyprogram.com> | 2013-10-29 20:53:05 +0200 |
---|---|---|
committer | unknown <sanja@montyprogram.com> | 2013-10-29 20:53:05 +0200 |
commit | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (patch) | |
tree | bf55c043320485e4ce5c8be90c8d619b481a0306 /mysql-test/r/group_by.result | |
parent | fef416699009b78366d9eec937c01822b531f518 (diff) | |
parent | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (diff) | |
download | mariadb-git-f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7.tar.gz |
merge 5.5->10.0-base
Diffstat (limited to 'mysql-test/r/group_by.result')
-rw-r--r-- | mysql-test/r/group_by.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index d06d0e51a56..6c0d77b36b0 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -2415,6 +2415,11 @@ a 200 set optimizer_switch=@save_optimizer_switch; DROP TABLE t1,t2; +# +# MDEV-5104 crash in Item_field::used_tables with broken order by +# +(select 1 order by x(y)) order by 1; +ERROR 42S22: Unknown column 'y' in 'order clause' # End of 5.3 tests # # Bug#49771: Incorrect MIN (date) when minimum value is 0000-00-00 |