From d5f4c14b6e1ba0c0639e513d50eace20d6f8c15d Mon Sep 17 00:00:00 2001
From: unknown <pem@mysql.comhem.se>
Date: Fri, 27 May 2005 14:48:33 +0200
Subject: [PATCH] Fixed BUG#9559: Functions: Numeric Operations using -ve value
 gives incorrect                   results.   Actually a problem when
 converting decimal to int for user variables.

mysql-test/r/sp.result:
  New test case for BUG#9559.
mysql-test/t/sp.test:
  New test case for BUG#9559.
sql/item_func.cc:
  Don't set the unsigned flag when converting decimal user var to int.
---
 mysql-test/r/sp.result | 11 +++++++++++
 mysql-test/t/sp.test   | 19 +++++++++++++++++++
 sql/item_func.cc       |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index c1164380f09..da54c100178 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -3098,4 +3098,15 @@ call bug5963_2(1)|
 call bug5963_2(1)|
 drop procedure bug5963_2|
 drop table t3|
+drop function if exists bug9559|
+create function bug9559()
+returns int
+begin
+set @y = -6/2;
+return @y;
+end|
+select bug9559()|
+bug9559()
+-3
+drop function bug9559|
 drop table t1,t2;
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 80acaacfdb3..18389f4d80a 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -3801,6 +3801,25 @@ call bug5963_2(1)|
 drop procedure bug5963_2|
 drop table t3|
 
+#
+# BUG#9559: Functions: Numeric Operations using -ve value gives incorrect
+#           results.
+#
+--disable_warnings
+drop function if exists bug9559|
+--enable_warnings
+create function bug9559()
+  returns int
+begin
+  set @y = -6/2;
+  return @y;
+end|
+
+select bug9559()|
+
+drop function bug9559|
+
+
 #
 # BUG#NNNN: New bug synopsis
 #
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 68f1cc52cff..92371e1a082 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -3597,7 +3597,7 @@ longlong user_var_entry::val_int(my_bool *null_value)
   case DECIMAL_RESULT:
   {
     longlong result;
-    my_decimal2int(E_DEC_FATAL_ERROR, (my_decimal *)value, 1, &result);
+    my_decimal2int(E_DEC_FATAL_ERROR, (my_decimal *)value, 0, &result);
     return result;
   }
   case STRING_RESULT: