Post-merge fix

acf417a7 · gluh@eagle.intranet.mysql.r18.ru · b0ec1cd8 · acf417a7
Commit acf417a7 authored Jul 13, 2005 by gluh@eagle.intranet.mysql.r18.ru
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/item_strfunc.cc sql/item_strfunc.cc +3 -2

No files found.
--- 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;