diff options
| author | unknown <monty@mysql.com> | 2006-06-22 12:21:41 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-22 12:21:41 +0300 |
| commit | 0f9ec6d6e82c3cced968d06dd1335537a17b995c (patch) | |
| tree | 5680b56f04ae23bff9cdd5d0654d9e2bf4de3fd3 /sql/sql_string.cc | |
| parent | 993920327752b22895332c0af4b0f6032f27f972 (diff) | |
| parent | 962ae921ba3a36693f7b916356ff33901221d7ea (diff) | |
| download | mariadb-git-0f9ec6d6e82c3cced968d06dd1335537a17b995c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/r/rpl_ndb_log.result:
Auto merged
mysql-test/r/rpl_row_log.result:
Auto merged
mysql-test/r/rpl_row_log_innodb.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/mysql_priv.h:
SCCS merged
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index f86c05d2f4f..89010c1e213 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -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 |