diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-06-17 17:04:51 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-06-17 17:04:51 +0400 |
| commit | fee78df3130f68c68df7c136593cf92bcb0dd208 (patch) | |
| tree | 1ab863e2c0045fbd140fb082d72732b37e65faed /sql/item_timefunc.h | |
| parent | ad947563ac9e42090cbcaef00ce0d22708d19f12 (diff) | |
| download | mariadb-git-fee78df3130f68c68df7c136593cf92bcb0dd208.tar.gz | |
MDEV-4651 Crash in my_decimal2decimal in a ORDER BY query
modified:
mysql-test/r/ps_2myisam.result
mysql-test/r/ps_3innodb.result
mysql-test/r/ps_4heap.result
mysql-test/r/ps_5merge.result
mysql-test/r/type_datetime_hires.result
mysql-test/suite/maria/r/ps_maria.result
mysql-test/t/type_datetime_hires.test
sql/item_timefunc.h
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 25a160d91f6..b17e1c794ee 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -370,6 +370,7 @@ public: decimals= args[0]->decimals; set_if_smaller(decimals, TIME_SECOND_PART_DIGITS); max_length=17 + (decimals ? decimals + 1 : 0); + set_persist_maybe_null(1); } void find_num_type() { hybrid_type= decimals ? DECIMAL_RESULT : INT_RESULT; } double real_op() { DBUG_ASSERT(0); return 0; } |