diff options
author | unknown <hf@deer.(none)> | 2005-03-07 20:53:51 +0400 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2005-03-07 20:53:51 +0400 |
commit | 00a163d46f8143fc391830991d661651d9deb5f1 (patch) | |
tree | 93b78a95b8ba743ba7f9069cfb83219382d5cfc3 /sql/field.cc | |
parent | 01c3fb8ed1bc095bf63a4dbe89821c04edf7f6f1 (diff) | |
download | mariadb-git-00a163d46f8143fc391830991d661651d9deb5f1.tar.gz |
Fix for bug #8935 CAST(time AS DECIMAL) crashes
mysql-test/r/cast.result:
test result
mysql-test/r/func_group.result:
test result
mysql-test/t/cast.test:
test case
sql/field.cc:
this assert isn't correct actually
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 1538edc59a3..fd4d83a8b1c 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -626,7 +626,6 @@ int Field_str::store_decimal(const my_decimal *d) my_decimal *Field_str::val_decimal(my_decimal *decimal_value) { - DBUG_ASSERT(result_type() == INT_RESULT); longlong nr= val_int(); int2my_decimal(E_DEC_FATAL_ERROR, nr, 0, decimal_value); return decimal_value; |