summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-03-16 00:04:05 +0200
committerunknown <monty@mysql.com>2004-03-16 00:04:05 +0200
commita98dcbfffc274e768441c333f539680e12e28255 (patch)
tree2a673561fb1d04aa026fb58fe6b6f3dead25538a /strings
parent33fc9c3c9e4dd3c7dc02aa4fef8215fc63db1120 (diff)
parentc2589ba08cdb131d99657d5e2df87041ab44049e (diff)
downloadmariadb-git-a98dcbfffc274e768441c333f539680e12e28255.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-simple.c16
1 files changed, 8 insertions, 8 deletions
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;