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

Removed some default_charset_info

Browse Source
This commit is contained in:
unknown
2002-03-14 22:10:56 +04:00
parent 8959b690fe
commit 9a0253ffb2
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/sql_string.cc
View File

@ -617,7 +617,7 @@ int wild_case_compare(CHARSET_INFO *cs, const char *str,const char *str_end,
{ {
int result= -1; // Not found, using wildcards int result= -1; // Not found, using wildcards
#ifdef USE_MB #ifdef USE_MB
bool use_mb_flag=use_mb(default_charset_info); bool use_mb_flag=use_mb(cs);
#endif #endif
while (wildstr != wildend) while (wildstr != wildend)
{ {

3
mysys/hash.c
View File

@ -275,10 +275,9 @@ static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length)
{ {
uint rec_keylength; uint rec_keylength;
byte *rec_key=hash_key(hash,pos->data,&rec_keylength,1); byte *rec_key=hash_key(hash,pos->data,&rec_keylength,1);
/* BAR TODO: remove default_charset_info */
return (length && length != rec_keylength) || return (length && length != rec_keylength) ||
(hash->flags & HASH_CASE_INSENSITIVE ? (hash->flags & HASH_CASE_INSENSITIVE ?
my_strncasecmp(default_charset_info, rec_key,key,rec_keylength) : my_strncasecmp(hash->charset, rec_key,key,rec_keylength) :
memcmp(rec_key,key,rec_keylength)); memcmp(rec_key,key,rec_keylength));
} }