1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge mysql.com:/usr/home/bar/mysql-4.1

into  mysql.com:/usr/home/bar/mysql-5.0
This commit is contained in:
bar@mysql.com
2005-07-20 13:40:18 +05:00
11 changed files with 184 additions and 4 deletions

View File

@@ -1034,9 +1034,15 @@ my_bool my_like_range_simple(CHARSET_INFO *cs,
char *min_str,char *max_str,
uint *min_length,uint *max_length)
{
const char *end=ptr+ptr_length;
const char *end;
char *min_org=min_str;
char *min_end=min_str+res_length;
#ifdef USE_MB
uint charlen= my_charpos(cs, ptr, ptr+ptr_length, res_length/cs->mbmaxlen);
if (charlen < ptr_length)
ptr_length= charlen;
#endif
end= ptr + ptr_length;
for (; ptr != end && min_str != min_end ; ptr++)
{