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

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

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