diff options
author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-08-19 09:06:50 +0200 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-08-19 09:06:50 +0200 |
commit | af6f0876ade33ad67e4a3f458a88ec21649656e2 (patch) | |
tree | 73cea93f02979761076fafb51153522053e8bf3a /sql/field.cc | |
parent | 0b78d5641248dc8c92a36713bfa9f4958b66648a (diff) | |
download | mariadb-git-af6f0876ade33ad67e4a3f458a88ec21649656e2.tar.gz |
Backport from trunk of:
Bug#12532830 - SIGFPE OR ASSERTION (PRECISION <= ((9 * 9) - 8*2)) && (DEC <= 30)
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index e1a24e82718..ef66c1ba9bb 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -9159,8 +9159,9 @@ void Create_field::init_for_tmp_table(enum_field_types sql_type_arg, pack_flag= FIELDFLAG_INTERVAL; break; - case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_NEWDECIMAL: + DBUG_ASSERT(decimals_arg <= DECIMAL_MAX_SCALE); + case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: pack_flag= FIELDFLAG_NUMBER | |