database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  mysql.com:/home/my/mysql-5.1


include/my_sys.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
This commit is contained in:
unknown
2006-06-19 13:00:36 +03:00
parent 9f8c532f0c 4b316e6fd6
commit cd3fa2ee71
19 changed files with 141 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_string.cc
View File

@ -710,8 +710,8 @@ void String::qs_append(uint i)
int sortcmp(const String *s,const String *t, CHARSET_INFO *cs)
{
return cs->coll->strnncollsp(cs,
(unsigned char *) s->ptr(),s->length(),
(unsigned char *) t->ptr(),t->length(), 0);
(uchar *) s->ptr(),s->length(),
(uchar *) t->ptr(),t->length(), 0);
}
@ -724,7 +724,7 @@ int sortcmp(const String *s,const String *t, CHARSET_INFO *cs)
t Second string
NOTE:
Strings are compared as a stream of unsigned chars
Strings are compared as a stream of uchars
RETURN
< 0 s < t