1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use sort_order directly

Browse Source
This commit is contained in:
unknown 2002-10-10 17:32:24 +05:00
parent 08f44a4365
commit 16f5d95308
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myisam/ft_static.c
View File

@ -36,7 +36,7 @@ const HA_KEYSEG ft_keysegs[FT_SEGS]={
HA_FT_WLEN, /* start */
#endif /* EVAL_RUN */
0, /* null_pos */
NULL /* sort_order */
NULL /* charset */
},
#ifdef EVAL_RUN
{

23
mysys/my_handler.c
View File

@ -20,28 +20,9 @@
int mi_compare_text(CHARSET_INFO *charset_info, uchar *a, uint a_length,
uchar *b, uint b_length, my_bool part_key)
{
int flag;
#ifdef USE_STRCOLL
if (use_strnxfrm(charset_info))
{
if (part_key && b_length < a_length)
a_length=b_length;
return my_strnncoll(charset_info, a, a_length, b, b_length);
}
else
#endif
{
uint length= min(a_length,b_length);
uchar *end= a+ length;
uchar *sort_order=charset_info->sort_order;
while (a < end)
if ((flag= (int) sort_order[*a++] - (int) sort_order[*b++]))
return flag;
}
if (part_key && b_length < a_length)
return 0;
return (int) (a_length-b_length);
a_length=b_length;
return my_strnncoll(charset_info, a, a_length, b, b_length);
}
static int compare_bin(uchar *a, uint a_length, uchar *b, uint b_length,