diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-09-07 20:39:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-09-07 20:39:47 +0200 |
| commit | 3e97aeafd65b2b05a7a33ba21420bfa85208e820 (patch) | |
| tree | 4d8570144b981d437cce7422c0ef8e2316b404fa /mysql-test/r | |
| parent | ee66fbb40275fd1b97cdee2fac7fb5c784e054c3 (diff) | |
| download | mariadb-git-3e97aeafd65b2b05a7a33ba21420bfa85208e820.tar.gz | |
lp:839387 Assertion `(Item_result)i != TIME_RESULT' failed with CASE + datetime
remove incorrect DBUG_ASSERT().
Fix incorrectly used cmp_item::get_comparator() in Item_func_case and Item_equal
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/case.result | 7 | ||||
| -rw-r--r-- | mysql-test/r/join.result | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result index 0c0e2d623c8..103883deb15 100644 --- a/mysql-test/r/case.result +++ b/mysql-test/r/case.result @@ -218,3 +218,10 @@ a d 3 11120436154190595086 drop table t1, t2; End of 5.0 tests +create table t1 (f1 time); +insert t1 values ('00:00:00'),('00:01:00'); +select case t1.f1 when '00:00:00' then 1 end from t1; +case t1.f1 when '00:00:00' then 1 end +1 +NULL +drop table t1; diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result index 03f7ce70dea..bd0df96c518 100644 --- a/mysql-test/r/join.result +++ b/mysql-test/r/join.result @@ -1339,3 +1339,11 @@ WHERE t1.f1 IN (SELECT f1 FROM t1) AND t1.f1 = t2.f1 OR t1.f1 = 9; f1 f2 f1 f2 9 4 10 9 DROP TABLE t1,t2; +create table t1 (i time key); +insert into t1 values ('1:1:1'), ('2:2:2'); +create table t2 (i time); +insert into t2 values ('1:1:1'); +select t2.i from t1 left join t2 on t2.i = t1.i where t1.i = '1:1:1'; +i +01:01:01 +drop table t1,t2; |