diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 12:15:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 12:15:17 +0200 |
| commit | d63e19806108efc1ca8d533841ad2471f2e0c4fe (patch) | |
| tree | e7f63499d0768e3af50b5c576048adbd84f4786f /strings | |
| parent | 6472c5c015a174ffd680fddc8f20c7a94684a552 (diff) | |
| parent | 03977e8273cbd33c3cbfec191ceee856f973ce1a (diff) | |
| download | mariadb-git-d63e19806108efc1ca8d533841ad2471f2e0c4fe.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/ctype-simple.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 33a000ee5fa..825a653d02f 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -461,7 +461,6 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs, register uint cutlim; register uint32 i; register const char *s; - register uchar c; const char *save, *e; int overflow; @@ -496,8 +495,9 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs, overflow = 0; i = 0; - for (c = *s; s != e; c = *++s) + for ( ; s != e; ++s) { + register uchar c= *s; if (c>='0' && c<='9') c -= '0'; else if (c>='A' && c<='Z') |