diff options
| author | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-05 19:38:42 +0200 |
| commit | 859b68847666823baa328c5c7f3da96787807bb3 (patch) | |
| tree | 56f9dc35fe3c9e6c4f341e577ff3db68855d9e81 /strings/strto.c | |
| parent | 564487d7c00098e8a37c8e675197414667685452 (diff) | |
| parent | 496a0e1630f9dc4047fb5244cb87ee5ca03b409e (diff) | |
| download | mariadb-git-859b68847666823baa328c5c7f3da96787807bb3.tar.gz | |
Merge with 4.0.6
Diffstat (limited to 'strings/strto.c')
| -rw-r--r-- | strings/strto.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/strings/strto.c b/strings/strto.c index cd70616d294..cd8dee53692 100644 --- a/strings/strto.c +++ b/strings/strto.c @@ -103,6 +103,7 @@ function (const char *nptr,char **endptr,int base) } /* Check for a sign. */ + negative= 0; if (*s == '-') { negative = 1; @@ -110,11 +111,9 @@ function (const char *nptr,char **endptr,int base) } else if (*s == '+') { - negative = 0; ++s; } - else - negative = 0; + if (base == 16 && s[0] == '0' && my_toupper (system_charset_info, s[1]) == 'X') s += 2; |