database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for bug#2972 Problem the the CONV() function

Browse Source
This commit is contained in:
unknown
2004-03-15 19:18:30 +04:00
parent afedd9f8f7
commit 60354533c1
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/func_str.result
View File

@ -624,6 +624,9 @@ Note 1003 select high_priority md5(_latin1'hello') AS `md5('hello')`,sha(_latin1
SELECT lpad(12345, 5, "#"); SELECT lpad(12345, 5, "#");
lpad(12345, 5, "#") lpad(12345, 5, "#")
12345 12345
SELECT conv(71, 10, 36), conv('1Z', 36, 10);
conv(71, 10, 36) conv('1Z', 36, 10)
1Z 71
create table t1 (id int(1), str varchar(10)) DEFAULT CHARSET=utf8; create table t1 (id int(1), str varchar(10)) DEFAULT CHARSET=utf8;
insert into t1 values (1,'aaaaaaaaaa'), (2,'bbbbbbbbbb'); insert into t1 values (1,'aaaaaaaaaa'), (2,'bbbbbbbbbb');
create table t2 (id int(1), str varchar(10)) DEFAULT CHARSET=utf8; create table t2 (id int(1), str varchar(10)) DEFAULT CHARSET=utf8;

7
mysql-test/t/func_str.test
View File

@ -361,6 +361,13 @@ explain extended select md5('hello'), sha('abc'), sha1('abc'), soundex(''), 'moo
SELECT lpad(12345, 5, "#"); SELECT lpad(12345, 5, "#");
#
# Bug #2972
#
SELECT conv(71, 10, 36), conv('1Z', 36, 10);
# #
# Bug #3089 # Bug #3089

16
strings/ctype-simple.c
View File

@ -262,9 +262,9 @@ long my_strntol_8bit(CHARSET_INFO *cs,
{ {
if (c>='0' && c<='9') if (c>='0' && c<='9')
c -= '0'; c -= '0';
else if (c>='A' && c<='F') else if (c>='A' && c<='Z')
c = c - 'A' + 10; c = c - 'A' + 10;
else if (c>='a' && c<='f') else if (c>='a' && c<='z')
c = c - 'a' + 10; c = c - 'a' + 10;
else else
break; break;
@ -384,9 +384,9 @@ ulong my_strntoul_8bit(CHARSET_INFO *cs,
{ {
if (c>='0' && c<='9') if (c>='0' && c<='9')
c -= '0'; c -= '0';
else if (c>='A' && c<='F') else if (c>='A' && c<='Z')
c = c - 'A' + 10; c = c - 'A' + 10;
else if (c>='a' && c<='f') else if (c>='a' && c<='z')
c = c - 'a' + 10; c = c - 'a' + 10;
else else
break; break;
@ -499,9 +499,9 @@ longlong my_strntoll_8bit(CHARSET_INFO *cs __attribute__((unused)),
{ {
if (c>='0' && c<='9') if (c>='0' && c<='9')
c -= '0'; c -= '0';
else if (c>='A' && c<='F') else if (c>='A' && c<='Z')
c = c - 'A' + 10; c = c - 'A' + 10;
else if (c>='a' && c<='f') else if (c>='a' && c<='z')
c = c - 'a' + 10; c = c - 'a' + 10;
else else
break; break;
@ -622,9 +622,9 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
{ {
if (c>='0' && c<='9') if (c>='0' && c<='9')
c -= '0'; c -= '0';
else if (c>='A' && c<='F') else if (c>='A' && c<='Z')
c = c - 'A' + 10; c = c - 'A' + 10;
else if (c>='a' && c<='f') else if (c>='a' && c<='z')
c = c - 'a' + 10; c = c - 'a' + 10;
else else
break; break;