Commit 3da42ce8 authored by unknown's avatar unknown

fixed mi_comp_unique to use _mi_compare_text()

parent 704ed50b
...@@ -170,19 +170,19 @@ int mi_unique_comp(MI_UNIQUEDEF *def, const byte *a, const byte *b, ...@@ -170,19 +170,19 @@ int mi_unique_comp(MI_UNIQUEDEF *def, const byte *a, const byte *b,
memcpy_fixed((byte*) &pos_a,pos_a+keyseg->bit_start,sizeof(char*)); memcpy_fixed((byte*) &pos_a,pos_a+keyseg->bit_start,sizeof(char*));
memcpy_fixed((byte*) &pos_b,pos_b+keyseg->bit_start,sizeof(char*)); memcpy_fixed((byte*) &pos_b,pos_b+keyseg->bit_start,sizeof(char*));
} }
end= pos_a+length;
if (type == HA_KEYTYPE_TEXT || type == HA_KEYTYPE_VARTEXT) if (type == HA_KEYTYPE_TEXT || type == HA_KEYTYPE_VARTEXT)
{ {
uchar *sort_order=keyseg->charset->sort_order; if (_mi_compare_text(keyseg->charset, (uchar *)pos_a, length,
while (pos_a != end) (uchar *)pos_b, length, 0))
if (sort_order[*(uchar*) pos_a++] !=
sort_order[*(uchar*) pos_b++])
return 1; return 1;
} }
else else
{
end= pos_a+length;
while (pos_a != end) while (pos_a != end)
if (*pos_a++ != *pos_b++) if (*pos_a++ != *pos_b++)
return 1; return 1;
} }
}
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment