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

bug#3556 - soundex

Browse Source
This commit is contained in:
unknown
2004-04-28 14:19:02 +02:00
parent b590c36a36
commit fdee1cbbb4
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,9 +77,9 @@ bbbb bb bbbbbbbb aaaa bbbb
select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') ; select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') ;
replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL')
this is a REAL test this is a REAL test
select soundex(''),soundex('he'),soundex('hello all folks'); select soundex(''),soundex('he'),soundex('hello all folks'),soundex('#3556 in bugdb');
soundex('') soundex('he') soundex('hello all folks') soundex('') soundex('he') soundex('hello all folks') soundex('#3556 in bugdb')
H000 H4142 H000 H4142 I51231
select md5('hello'); select md5('hello');
md5('hello') md5('hello')
5d41402abc4b2a76b9719d911017c592 5d41402abc4b2a76b9719d911017c592

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

@ -35,7 +35,7 @@ SELECT CONCAT('"',CONCAT_WS('";"',repeat('a',60),repeat('b',60),repeat('c',60),r
select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es'); select insert('txs',2,1,'hi'),insert('is ',4,0,'a'),insert('txxxxt',2,4,'es');
select replace('aaaa','a','b'),replace('aaaa','aa','b'),replace('aaaa','a','bb'),replace('aaaa','','b'),replace('bbbb','a','c'); select replace('aaaa','a','b'),replace('aaaa','aa','b'),replace('aaaa','a','bb'),replace('aaaa','','b'),replace('bbbb','a','c');
select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') ; select replace(concat(lcase(concat('THIS',' ','IS',' ','A',' ')),ucase('false'),' ','test'),'FALSE','REAL') ;
select soundex(''),soundex('he'),soundex('hello all folks'); select soundex(''),soundex('he'),soundex('hello all folks'),soundex('#3556 in bugdb');
select md5('hello'); select md5('hello');
select sha('abc'); select sha('abc');
select sha1('abc'); select sha1('abc');

4
mysys/mf_soundex.c
View File

@ -51,7 +51,7 @@ void soundex(register my_string out_pntr, my_string in_pntr,
if (remove_garbage) if (remove_garbage)
{ {
while (*in_pntr && isspace(*in_pntr)) /* Skipp pre-space */ while (*in_pntr && !isalpha(*in_pntr))
in_pntr++; in_pntr++;
} }
*out_pntr++ = toupper(*in_pntr); /* Copy first letter */ *out_pntr++ = toupper(*in_pntr); /* Copy first letter */
@ -97,7 +97,7 @@ static char get_scode(char **ptr, pbool remove_garbage)
ch=toupper(**ptr); ch=toupper(**ptr);
if (ch < 'A' || ch > 'Z') if (ch < 'A' || ch > 'Z')
{ {
if (isalpha(ch)) /* If exetended alfa (country spec) */ if (isalpha(ch)) /* If extended alpha (country spec) */
return '0'; /* threat as vokal */ return '0'; /* threat as vokal */
return 0; /* Can't map */ return 0; /* Can't map */
} }

2
sql/item_strfunc.cc
View File

@ -1422,7 +1422,7 @@ String *Item_func_soundex::val_str(String *str)
char *to= (char *) tmp_value.ptr(); char *to= (char *) tmp_value.ptr();
char *from= (char *) res->ptr(), *end=from+res->length(); char *from= (char *) res->ptr(), *end=from+res->length();
while (from != end && isspace(*from)) // Skip pre-space while (from != end && !isalpha(*from)) // Skip pre-space
from++; /* purecov: inspected */ from++; /* purecov: inspected */
if (from == end) if (from == end)
return &empty_string; // No alpha characters. return &empty_string; // No alpha characters.