Commit dc6810ec authored by unknown's avatar unknown
Browse files

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

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


sql/item_func.cc:
  Auto merged
mysql-test/t/func_math.test:
  Resolve conflict
parents a69ca6dc 5841d70a

mysql-test/r/func_math.result

+3 −0
Original line number Diff line number Diff line
@@ -137,3 +137,6 @@ select * from t1; 
round(1, 6)

1.000000

drop table t1;

select abs(-2) * -2;

abs(-2) * -2

-4

mysql-test/t/func_math.test

+5 −0
Original line number Diff line number Diff line
@@ -72,4 +72,9 @@ show create table t1; 
select * from t1;

drop table t1;



#

# Bug #11402: abs() forces rest of calculation to unsigned

#

select abs(-2) * -2;



# End of 4.1 tests

sql/item_func.cc

+0 −3
Original line number Diff line number Diff line
@@ -765,10 +765,7 @@ void Item_func_abs::fix_length_and_dec() 
  max_length=args[0]->max_length;

  hybrid_type= REAL_RESULT;

  if (args[0]->result_type() == INT_RESULT)

  {

    hybrid_type= INT_RESULT;

    unsigned_flag= 1;

  }

}