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

An improvement of the fix for the bug #2231: string column,

Browse Source 
INDEX+LIKE, don't take the ESCAPE character. (ver. 2)
This commit is contained in:
unknown
2004-01-08 12:24:36 +04:00
parent 824111e6c4
commit aafca9f08d
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sql/opt_range.cc
View File

@ -290,7 +290,7 @@ typedef struct st_qsel_param {
char min_key[MAX_KEY_LENGTH+MAX_FIELD_WIDTH],
max_key[MAX_KEY_LENGTH+MAX_FIELD_WIDTH];
bool quick; // Don't calulate possible keys
char escape;
COND *cond;
} PARAM;
static SEL_TREE * get_mm_parts(PARAM *param,Field *field,
@ -638,9 +638,6 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use,
param.table=head;
param.keys=0;
param.mem_root= &alloc;
if (cond->type() == Item::FUNC_ITEM &&
((Item_func*)cond)->functype() == Item_func::LIKE_FUNC)
param.escape= ((Item_func_like*)cond)->escape;
param.thd->no_errors=1; // Don't warn about NULL
init_sql_alloc(&alloc, param.thd->variables.range_alloc_block_size, 0);
if (!(param.key_parts = (KEY_PART*) alloc_root(&alloc,
@ -821,6 +818,8 @@ static SEL_TREE *get_mm_tree(PARAM *param,COND *cond)
if (cond_func->select_optimize() == Item_func::OPTIMIZE_NONE)
DBUG_RETURN(0); // Can't be calculated
param->cond= cond;
if (cond_func->functype() == Item_func::BETWEEN)
{
if (cond_func->arguments()[0]->type() == Item::FIELD_ITEM)
@ -997,23 +996,26 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
if (maybe_null)
max_str[0]= min_str[0]=0;
if (field->binary())
like_error=like_range(res->ptr(),res->length(),param->escape,field_length,
min_str+offset,max_str+offset,(char) 255,
&min_length,&max_length);
like_error=like_range(res->ptr(), res->length(),
((Item_func_like*)(param->cond))->escape,
field_length, min_str + offset, max_str + offset,
(char) 255, &min_length, &max_length);
else
{
#ifdef USE_STRCOLL
if (use_strcoll(default_charset_info))
like_error= my_like_range(default_charset_info,
res->ptr(),res->length(),param->escape,
field_length, min_str+maybe_null,
max_str+maybe_null,&min_length,&max_length);
like_error= my_like_range(default_charset_info, res->ptr(),
res->length(),
((Item_func_like*)(param->cond))->escape,
field_length, min_str + maybe_null,
max_str + maybe_null, &min_length,
&max_length);
else
#endif
like_error=like_range(res->ptr(),res->length(),param->escape,
field_length,
min_str+offset,max_str+offset,
max_sort_char,&min_length,&max_length);
like_error=like_range(res->ptr(), res->length(),
((Item_func_like*)(param->cond))->escape,
field_length, min_str + offset, max_str + offset,
max_sort_char, &min_length, &max_length);
}
if (like_error) // Can't optimize with LIKE
DBUG_RETURN(0);