summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-03-21 13:02:53 +0100
committerSergei Golubchik <serg@mariadb.org>2016-03-21 13:02:53 +0100
commit3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch)
tree39cefed54f79f93f82e9c33a4e094270103bf137 /strings
parente7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff)
parent22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff)
downloadmariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'strings')
-rw-r--r--strings/str2int.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/str2int.c b/strings/str2int.c
index ec89503af5e..fe6cd6b793e 100644
--- a/strings/str2int.c
+++ b/strings/str2int.c
@@ -45,7 +45,7 @@
easy task. Coping with integer overflow and the asymmetric range of
twos complement machines is anything but easy.
- So that users of atoi and atol can check whether an error occured,
+ So that users of atoi and atol can check whether an error occurred,
I have taken a wholly unprecedented step: errno is CLEARED if this
call has no problems.
*/