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

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt

Browse Source 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/type_decimal.result:
  Auto merged
sql/item_func.cc:
  Auto merged
This commit is contained in:
unknown 2007-06-14 16:35:20 +05:00
commit 167751b3f0
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/type_decimal.result
View File

@ -790,3 +790,12 @@ Warning 1292 Incorrect datetime value: '0000-00-00'
Warning 1292 Incorrect datetime value: '0000-00-00' Warning 1292 Incorrect datetime value: '0000-00-00'
Warning 1292 Incorrect datetime value: '0000-00-00' Warning 1292 Incorrect datetime value: '0000-00-00'
drop table t1; drop table t1;
CREATE TABLE t1 (
qty decimal(16,6) default NULL,
dps tinyint(3) unsigned default NULL
);
INSERT INTO t1 VALUES (1.1325,3);
SELECT ROUND(qty,3), dps, ROUND(qty,dps) FROM t1;
ROUND(qty,3) dps ROUND(qty,dps)
1.133 3 1.133
DROP TABLE t1;

14
mysql-test/t/type_decimal.test
View File

@ -394,3 +394,17 @@ create table t1 as
from (select 1 as s,'t' as t union select null, null ) as sub1; from (select 1 as s,'t' as t union select null, null ) as sub1;
select group_concat(t) from t1 group by week(date)/10; select group_concat(t) from t1 group by week(date)/10;
drop table t1; drop table t1;
#
# Bug#28980: ROUND(<dec expr>, <int col>) returned double values
#
CREATE TABLE t1 (
qty decimal(16,6) default NULL,
dps tinyint(3) unsigned default NULL
);
INSERT INTO t1 VALUES (1.1325,3);
SELECT ROUND(qty,3), dps, ROUND(qty,dps) FROM t1;
DROP TABLE t1;

8
sql/item_func.cc
View File

@ -1954,7 +1954,13 @@ void Item_func_round::fix_length_and_dec()
{ {
max_length= args[0]->max_length; max_length= args[0]->max_length;
decimals= args[0]->decimals; decimals= args[0]->decimals;
hybrid_type= REAL_RESULT; if (args[0]->result_type() == DECIMAL_RESULT)
{
max_length++;
hybrid_type= DECIMAL_RESULT;
}
else
hybrid_type= REAL_RESULT;
return; return;
} }