summaryrefslogtreecommitdiff
path: root/strings/strto.c
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-11-04 16:14:09 +0200
committermonty@hundin.mysql.fi <>2001-11-04 16:14:09 +0200
commitfd0780493d9f91c1b4e8a0ff80fc670d5cf3b19a (patch)
tree689c9d0271e23431f1ab0ac09e1af4d68a58ca76 /strings/strto.c
parent67951fdeb4195d6fcefeba6aab811b6c5e585178 (diff)
parent65d4c846d83467270e56537b2cd0f44fc37ef9be (diff)
downloadmariadb-git-fd0780493d9f91c1b4e8a0ff80fc670d5cf3b19a.tar.gz
merge with 3.23.44
Diffstat (limited to 'strings/strto.c')
-rw-r--r--strings/strto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/strto.c b/strings/strto.c
index adada98e143..72ab29caed3 100644
--- a/strings/strto.c
+++ b/strings/strto.c
@@ -197,7 +197,7 @@ function (const char *nptr,char **endptr,int base)
}
/* Return the result of the appropriate sign. */
- return (negative ? -((longtype) i) : i);
+ return (negative ? -((longtype) i) : (longtype) i);
noconv:
/* There was no number to convert. */