1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

5.1 -> 5.5 merge

Browse Source
This commit is contained in:
Sergey Glukhov 2011-05-26 14:09:25 +04:00
commit f52ff493e8
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/func_math.result
View File

@ -543,6 +543,12 @@ ROUND(LEAST(15, -4939092, 0.2704), STDDEV('a'))
-4939092.0000 -4939092.0000
Warnings: Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'a' Warning 1292 Truncated incorrect DOUBLE value: 'a'
#
# Bug#12392636 ASSERTION FAILED: SCALE >= 0 && PRECISION > 0 && SCALE <= PRECISION
#
SELECT SUM(DISTINCT (TRUNCATE((.1), NULL)));
SUM(DISTINCT (TRUNCATE((.1), NULL)))
NULL
End of 5.1 tests End of 5.1 tests
# #
# Bug #8433: Overflow must be an error # Bug #8433: Overflow must be an error

6
mysql-test/t/func_math.test
View File

@ -370,6 +370,12 @@ DROP TABLE t1;
SELECT ROUND(LEAST(15, -4939092, 0.2704), STDDEV('a')); SELECT ROUND(LEAST(15, -4939092, 0.2704), STDDEV('a'));
--echo #
--echo # Bug#12392636 ASSERTION FAILED: SCALE >= 0 && PRECISION > 0 && SCALE <= PRECISION
--echo #
SELECT SUM(DISTINCT (TRUNCATE((.1), NULL)));
--echo End of 5.1 tests --echo End of 5.1 tests
--echo # --echo #

3
sql/item_func.cc
View File

@ -2259,6 +2259,9 @@ void Item_func_round::fix_length_and_dec()
} }
val1= args[1]->val_int(); val1= args[1]->val_int();
if ((null_value= args[1]->is_null()))
return;
val1_unsigned= args[1]->unsigned_flag; val1_unsigned= args[1]->unsigned_flag;
if (val1 < 0) if (val1 < 0)
decimals_to_set= val1_unsigned ? INT_MAX : 0; decimals_to_set= val1_unsigned ? INT_MAX : 0;