Merge with 4.0.8

1 files changed, 8 insertions, 0 deletions

diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
index 18241a8fcc1..914e05efa7a 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/r/case.result
@@ -63,3 +63,11 @@ nothing	2
 one	1
 two	1
 drop table t1;
+create table t1 (row int not null, col int not null, val varchar(255) not null);
+insert into t1 values (1,1,'orange'),(1,2,'large'),(2,1,'yellow'),(2,2,'medium'),(3,1,'green'),(3,2,'small');
+select max(case col when 1 then val else null end) as color from t1 group by row;
+color
+orange
+yellow
+green
+drop table t1;