bk commit into 5.2 tree (bar:1.2621)

[bar]

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-22 17:43:14+05:00, bar@stripped +1 -0
  Fix for compilation problem after wl#1213 was pushed.

  mysys/charset.c@stripped, 2007-10-22 17:43:12+05:00, bar@stripped +2 -2
    Fix for compilation problem after wl#1213 was pushed.

diff -Nrup a/mysys/charset.c b/mysys/charset.c
--- a/mysys/charset.c	2007-10-22 16:43:28 +05:00
+++ b/mysys/charset.c	2007-10-22 17:43:12 +05:00
@@ -268,14 +268,14 @@ static int add_collation(CHARSET_INFO *c
       }
       else if (!strcmp(cs->csname, "utf16"))
       {
-#if defined (HAVE_CHARSET_utf8mb3) && defined(HAVE_UCA_COLLATIONS)
+#if defined (HAVE_CHARSET_utf16) && defined(HAVE_UCA_COLLATIONS)
         copy_uca_collation(newcs, &my_charset_utf16_unicode_ci);
         newcs->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_NONASCII;
 #endif
       }
       else if (!strcmp(cs->csname, "utf32"))
       {
-#if defined (HAVE_CHARSET_utf8mb3) && defined(HAVE_UCA_COLLATIONS)
+#if defined (HAVE_CHARSET_utf32) && defined(HAVE_UCA_COLLATIONS)
         copy_uca_collation(newcs, &my_charset_utf32_unicode_ci);
         newcs->state|= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_NONASCII;
 #endif