From acf417a7e698891a7093db34ef965fc73b85319f Mon Sep 17 00:00:00 2001
From: "gluh@eagle.intranet.mysql.r18.ru" <>
Date: Wed, 13 Jul 2005 16:08:14 +0500
Subject: [PATCH] Post-merge fix

---
 sql/item_strfunc.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index a8fd7dcf75d..2fd0f25e699 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2383,9 +2383,10 @@ String *Item_func_hex::val_str(String *str)
     ulonglong dec;
     char ans[65],*ptr;
     /* Return hex of unsigned longlong value */
-    if (args[0]->result_type() == REAL_RESULT)
+    if (args[0]->result_type() == REAL_RESULT ||
+        args[0]->result_type() == DECIMAL_RESULT)
     {
-      double val= args[0]->val();
+      double val= args[0]->val_real();
       if ((val <= (double) LONGLONG_MIN) || 
           (val >= (double) (ulonglong) ULONGLONG_MAX))
         dec=  ~(longlong) 0;