summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-12 02:38:57 +0300
committerunknown <monty@mysql.com>2004-05-12 02:38:57 +0300
commit47890151b47af55431a808e59af738a35d1a0bb7 (patch)
tree02e8baaa5fa67d84f1517dd0fe43ee84dd6ef34f /sql/item_func.cc
parentcd8f9ed2a294a80eb41f026eaab176e51209aa4c (diff)
downloadmariadb-git-47890151b47af55431a808e59af738a35d1a0bb7.tar.gz
Portability fixes
scripts/mysql_install_db.sh: Portability fix (! is not portable) sql/item_func.cc: Use my_strtoll10() instead of strtoull() sql/repl_failsafe.cc: Use my_strtoll10() instead of strtoull() sql/sql_analyse.cc: Use my_strtoll10() instead of strtoull() sql/sql_yacc.yy: Use my_strtoll10() instead of strtoull() strings/my_strtoll10.c: Fix compiler warnings
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index d7e778171a0..aaea676fee1 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2376,7 +2376,10 @@ longlong user_var_entry::val_int(my_bool *null_value)
case INT_RESULT:
return *(longlong*) value;
case STRING_RESULT:
- return strtoull(value,NULL,10); // String is null terminated
+ {
+ int error;
+ return my_strtoll10(value, (char**) 0, &error);// String is null terminated
+ }
case ROW_RESULT:
DBUG_ASSERT(1); // Impossible
break;