bk commit into 5.1 tree (df:1.2370)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df 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, 2006-12-01 14:25:32+01:00, df@stripped +1 -0
  fix build failure introduced by 5.1-marvel merge

  include/m_ctype.h@stripped, 2006-12-01 14:25:29+01:00, df@stripped +1 -1
    update prototype to reflect changes to my_strchr.c

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.1-build

--- 1.130/include/m_ctype.h	2006-11-07 12:05:25 +01:00
+++ 1.131/include/m_ctype.h	2006-12-01 14:25:29 +01:00
@@ -446,7 +446,7 @@ int my_wildcmp_unicode(CHARSET_INFO *cs,
 extern my_bool my_parse_charset_xml(const char *bug, uint len,
 				    int (*add)(CHARSET_INFO *cs));
 extern char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end,
-                       char c);
+                       pchar c);
 
 my_bool my_propagate_simple(CHARSET_INFO *cs, const uchar *str, uint len);
 my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, uint len);