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

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


libmysql/libmysql.c:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
This commit is contained in:
unknown 2004-08-26 18:27:33 +03:00
commit 717fc0b01e
28 changed files with 254 additions and 164 deletions

View file

@ -93,7 +93,7 @@ static int my_strnncoll_binary(CHARSET_INFO * cs __attribute__((unused)),
NOTE
This function is used for real binary strings, i.e. for
BLOB, BINARY(N) and VARBINARY(N).
It does not ignore trailing spaces.
It compares trailing spaces as spaces.
RETURN
< 0 s < t
@ -133,7 +133,8 @@ static int my_strnncoll_8bit_bin(CHARSET_INFO * cs __attribute__((unused)),
NOTE
This function is used for character strings with binary collations.
It ignores trailing spaces.
The shorter string is extended with end space to be as long as the longer
one.
RETURN
< 0 s < t