diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-05-14 11:57:47 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-05-14 11:57:47 +0400 |
| commit | 4dc690dc28d69abcc2be683819d8ab0798df0c9e (patch) | |
| tree | c1ad9b3302f40092983769d33608c064c1449566 | |
| parent | f827ba3b842d4bd18be37d4b983665b5840251bf (diff) | |
| parent | 31f34b20f3295db7e99877dcfe61b5798a6cfe95 (diff) | |
| download | mariadb-git-4dc690dc28d69abcc2be683819d8ab0798df0c9e.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
| -rw-r--r-- | mysql-test/r/func_math.result | 18 | ||||
| -rw-r--r-- | mysql-test/t/func_math.test | 12 | ||||
| -rw-r--r-- | sql/item_func.cc | 2 |
3 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 2a907a1648b..436542b7225 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -1015,6 +1015,24 @@ SELECT -9223372036854775808 MOD -9223372036854775808; -9223372036854775808 MOD -9223372036854775808 0 # +# MDEV-22502 MDB crashes in CREATE TABLE AS SELECT when the precision of returning type = 0 +# +CREATE TABLE t1 (d decimal(5,5)); +INSERT INTO t1 VALUES (0.55555); +SELECT TRUNCATE(d,0) FROM t1; +TRUNCATE(d,0) +0 +CREATE TABLE t2 AS SELECT TRUNCATE(d,0) FROM t1; +SELECT * FROM t2; +TRUNCATE(d,0) +0 +SHOW CREATE TABLE t2; +Table Create Table +t2 CREATE TABLE `t2` ( + `TRUNCATE(d,0)` decimal(1,0) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +DROP TABLE t1, t2; +# # MDEV-22503 MDB limits DECIMAL column precision to 16 doing CTAS with floor/ceil over DECIMAL(X,Y) where X > 16 # CREATE TABLE t44 (d1 decimal(38,0) DEFAULT NULL); diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test index 127cbb574f8..077cfdc5b6d 100644 --- a/mysql-test/t/func_math.test +++ b/mysql-test/t/func_math.test @@ -715,6 +715,18 @@ SELECT 9223372036854775808 MOD -9223372036854775808; SELECT -9223372036854775808 MOD 9223372036854775808; SELECT -9223372036854775808 MOD -9223372036854775808; +--echo # +--echo # MDEV-22502 MDB crashes in CREATE TABLE AS SELECT when the precision of returning type = 0 +--echo # + +CREATE TABLE t1 (d decimal(5,5)); +INSERT INTO t1 VALUES (0.55555); +SELECT TRUNCATE(d,0) FROM t1; +CREATE TABLE t2 AS SELECT TRUNCATE(d,0) FROM t1; +SELECT * FROM t2; +SHOW CREATE TABLE t2; +DROP TABLE t1, t2; + --echo # --echo # MDEV-22503 MDB limits DECIMAL column precision to 16 doing CTAS with floor/ceil over DECIMAL(X,Y) where X > 16 diff --git a/sql/item_func.cc b/sql/item_func.cc index 38dc0667e0b..4f8b83e530c 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2512,6 +2512,8 @@ bool Item_func_round::fix_length_and_dec() precision-= decimals_delta - length_increase; decimals= MY_MIN(decimals_to_set, DECIMAL_MAX_SCALE); + if (!precision) + precision= 1; // DECIMAL(0,0) -> DECIMAL(1,0) max_length= my_decimal_precision_to_length_no_truncation(precision, decimals, unsigned_flag); |