From 60354533c1156472d5433e15dd295ee76a9b8ee5 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Mar 2004 19:18:30 +0400 Subject: Fix for bug#2972 Problem the the CONV() function --- strings/ctype-simple.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'strings') diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c index 719ae14f653..6e7d0b849e2 100644 --- a/strings/ctype-simple.c +++ b/strings/ctype-simple.c @@ -262,9 +262,9 @@ long my_strntol_8bit(CHARSET_INFO *cs, { if (c>='0' && c<='9') c -= '0'; - else if (c>='A' && c<='F') + else if (c>='A' && c<='Z') c = c - 'A' + 10; - else if (c>='a' && c<='f') + else if (c>='a' && c<='z') c = c - 'a' + 10; else break; @@ -384,9 +384,9 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs, { if (c>='0' && c<='9') c -= '0'; - else if (c>='A' && c<='F') + else if (c>='A' && c<='Z') c = c - 'A' + 10; - else if (c>='a' && c<='f') + else if (c>='a' && c<='z') c = c - 'a' + 10; else break; @@ -499,9 +499,9 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)), { if (c>='0' && c<='9') c -= '0'; - else if (c>='A' && c<='F') + else if (c>='A' && c<='Z') c = c - 'A' + 10; - else if (c>='a' && c<='f') + else if (c>='a' && c<='z') c = c - 'a' + 10; else break; @@ -622,9 +622,9 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs, { if (c>='0' && c<='9') c -= '0'; - else if (c>='A' && c<='F') + else if (c>='A' && c<='Z') c = c - 'A' + 10; - else if (c>='a' && c<='f') + else if (c>='a' && c<='z') c = c - 'a' + 10; else break; -- cgit v1.2.1