database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-11402

Browse Source 
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item_func.cc:
  Auto merged
mysql-test/t/func_math.test:
  Resolve conflict
This commit is contained in:
unknown
2005-08-01 17:11:49 -07:00
parent a69ca6dc99 5841d70af8
commit dc6810ec5b
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,3 +137,6 @@ select * from t1;
round(1, 6) round(1, 6)
1.000000 1.000000
drop table t1; drop table t1;
select abs(-2) * -2;
abs(-2) * -2
-4

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

@@ -72,4 +72,9 @@ show create table t1;
select * from t1; select * from t1;
drop table t1; drop table t1;
#
# Bug #11402: abs() forces rest of calculation to unsigned
#
select abs(-2) * -2;
# End of 4.1 tests # End of 4.1 tests

3
sql/item_func.cc
View File

@@ -765,10 +765,7 @@ void Item_func_abs::fix_length_and_dec()
max_length=args[0]->max_length; max_length=args[0]->max_length;
hybrid_type= REAL_RESULT; hybrid_type= REAL_RESULT;
if (args[0]->result_type() == INT_RESULT) if (args[0]->result_type() == INT_RESULT)
{
hybrid_type= INT_RESULT; hybrid_type= INT_RESULT;
unsigned_flag= 1;
}
} }