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

stringcmp() and sortcmp() have been unified

Browse Source 
into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.
This commit is contained in:
bar@bar.mysql.r18.ru
2003-03-04 18:01:59 +04:00
parent 143c85057e
commit f95eb82934
11 changed files with 105 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_analyse.cc
View File

@ -41,13 +41,13 @@
int sortcmp2(void* cmp_arg __attribute__((unused)),
const String *a,const String *b)
{
return sortcmp(a,b);
return sortcmp(a,b,a->charset());
}
int stringcmp2(void* cmp_arg __attribute__((unused)),
const String *a,const String *b)
{
return stringcmp(a,b);
return sortcmp(a,b,&my_charset_bin);
}
int compare_double2(void* cmp_arg __attribute__((unused)),
@ -329,20 +329,10 @@ void field_str::add()
if (length > max_length)
max_length = length;
if (item->binary())
{
if (stringcmp(res, &min_arg) < 0)
min_arg.copy(*res);
if (stringcmp(res, &max_arg) > 0)
max_arg.copy(*res);
}
else
{
if (sortcmp(res, &min_arg) < 0)
min_arg.copy(*res);
if (sortcmp(res, &max_arg) > 0)
max_arg.copy(*res);
}
if (sortcmp(res, &min_arg,item->charset()) < 0)
min_arg.copy(*res);
if (sortcmp(res, &max_arg,item->charset()) > 0)
max_arg.copy(*res);
}
if (room_in_tree)