From: bar Date: October 24 2007 7:27am Subject: bk commit into 5.2 tree (bar:1.2624) List-Archive: http://lists.mysql.com/commits/36231 Message-Id: <200710240727.l9O7RpRA029710@bar.myoffice.izhnet.ru> Below is the list of changes that have just been committed into a local 5.2 repository of bar. When bar does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-10-24 12:27:46+05:00, bar@stripped +1 -0 More Windows warnings fixes strings/ctype-ucs2.c@stripped, 2007-10-24 12:27:44+05:00, bar@stripped +4 -4 More Windows warnings fixes diff -Nrup a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c --- a/strings/ctype-ucs2.c 2007-10-24 11:04:53 +05:00 +++ b/strings/ctype-ucs2.c 2007-10-24 12:27:44 +05:00 @@ -1381,8 +1381,8 @@ my_strnxfrm_utf16(CHARSET_INFO *cs, if (dst + 2 >= de) break; - *dst++= (uchar) wc >> 8; - *dst++= (uchar) wc & 0xFF; + *dst++= (uchar) (wc >> 8); + *dst++= (uchar) (wc & 0xFF); } return my_strxfrm_pad_desc_and_reverse(cs, d0, dst, de, nweights, flags, 0); @@ -2210,8 +2210,8 @@ my_strnxfrm_utf32(CHARSET_INFO *cs, if (dst + 2 >= de) break; - *dst++= (uchar) wc >> 8; - *dst++= (uchar) wc & 0xFF; + *dst++= (uchar) (wc >> 8); + *dst++= (uchar) (wc & 0xFF); } return my_strxfrm_pad_desc_and_reverse_utf32(cs, d0, dst, de, nweights, flags, 0);