diff options
author | unknown <iggy@amd64.(none)> | 2008-04-28 14:12:52 -0400 |
---|---|---|
committer | unknown <iggy@amd64.(none)> | 2008-04-28 14:12:52 -0400 |
commit | 525ecab12200f4d2ba78f4c419eb653315a5e805 (patch) | |
tree | 63adfa5e2dda4dbf457962e9944d16e000c562c6 /mysql-test | |
parent | 28a089825771dc29a2ac12a2a805f269e5d2c4d2 (diff) | |
parent | 96e405b6627181b063bde4cdae98310a1abf9eab (diff) | |
download | mariadb-git-525ecab12200f4d2ba78f4c419eb653315a5e805.tar.gz |
Merge amd64.(none):/src/rel_clean_up/my50-rel_clean_up
into amd64.(none):/src/rel_clean_up/my51-rel_clean_up
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/my_decimal.h:
Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/type_decimal.result | 7 | ||||
-rw-r--r-- | mysql-test/t/type_decimal.test | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result index 3e5f6a9b504..76c5ea8f756 100644 --- a/mysql-test/r/type_decimal.result +++ b/mysql-test/r/type_decimal.result @@ -946,4 +946,11 @@ SELECT ROUND(20061108085411.000002); ROUND(20061108085411.000002) 20061108085411 DROP TABLE t1, t2, t3, t4, t5, t6; +create table t1(`c` decimal(9,2)); +insert into t1 values (300),(201.11); +select max(case 1 when 1 then c else null end) from t1 group by c; +max(case 1 when 1 then c else null end) +201.11 +300.00 +drop table t1; End of 5.0 tests diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test index 6841b3cdd68..8a81908296f 100644 --- a/mysql-test/t/type_decimal.test +++ b/mysql-test/t/type_decimal.test @@ -521,4 +521,12 @@ SELECT ROUND(20061108085411.000002); DROP TABLE t1, t2, t3, t4, t5, t6; +# +# Bug#36023: Incorrect handling of zero length caused an assertion to fail. +# +create table t1(`c` decimal(9,2)); +insert into t1 values (300),(201.11); +select max(case 1 when 1 then c else null end) from t1 group by c; +drop table t1; + --echo End of 5.0 tests |