database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity

Post-merge fix

Browse Source
This commit is contained in:
gluh@eagle.intranet.mysql.r18.ru
2005-07-13 16:08:14 +05:00
parent b0ec1cd84e
commit acf417a7e6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/item_strfunc.cc
View File

@@ -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;