bk commit into 4.1 tree

[bar]

Below is the list of changes that have just been committed into a
4.1 repository of bar. When bar does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1234 02/04/17 14:16:26 bar@stripped +7 -0
  New win1250ch charset

  strings/ctype.c
    1.22 02/04/17 14:16:21 bar@stripped +33 -0
    New win1250ch charset

  strings/Makefile.am
    1.21 02/04/17 14:16:21 bar@stripped +4 -4
    New win1250ch charset

  sql/share/charsets/Index
    1.13 02/04/17 14:16:21 bar@stripped +1 -0
    New win1250ch charset

  libmysql/Makefile.shared
    1.30 02/04/17 14:16:21 bar@stripped +1 -1
    New win1250ch charset

  include/m_ctype.h
    1.29 02/04/17 14:16:21 bar@stripped +15 -0
    New win1250ch charset

  configure.in
    1.194 02/04/17 14:16:20 bar@stripped +5 -2
    New win1250ch charset

  acconfig.h
    1.28 02/04/17 14:16:20 bar@stripped +1 -0
    New win1250ch charset

# 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:	bar
# Host:	gw.udmsearch.izhnet.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.27/acconfig.h	Sat Apr 13 16:01:33 2002
+++ 1.28/acconfig.h	Wed Apr 17 14:16:20 2002
@@ -98,6 +98,7 @@
 #undef HAVE_CHARSET_usa7
 #undef HAVE_CHARSET_utf8
 #undef HAVE_CHARSET_win1250
+#undef HAVE_CHARSET_win1250ch
 #undef HAVE_CHARSET_win1251ukr
 #undef HAVE_CHARSET_win1251
 

--- 1.193/configure.in	Mon Apr 15 20:00:52 2002
+++ 1.194/configure.in	Wed Apr 17 14:16:20 2002
@@ -1933,9 +1933,9 @@
                           croat czech danish dec8 dos estonia euc_kr gb2312 gbk
                           german1 greek hebrew hp8 hungarian koi8_ru koi8_ukr
                           latin1 latin1_de latin2 latin5 sjis swe7 tis620 ujis
-                          usa7 utf8 win1250 win1251ukr"
+                          usa7 utf8 win1250 win1250ch win1251ukr"
 CHARSETS_DEPRECATED="win1251"
-CHARSETS_COMPLEX="big5 czech euc_kr gb2312 gbk latin1_de sjis tis620 ujis utf8"
+CHARSETS_COMPLEX="big5 czech euc_kr gb2312 gbk latin1_de sjis tis620 ujis utf8 win1250ch"
 DEFAULT_CHARSET=latin1
 AC_DIVERT_POP
 
@@ -2070,6 +2070,9 @@
       ;;
     win1250)
       AC_DEFINE(HAVE_CHARSET_win1250)
+      ;;
+    win1250ch)
+      AC_DEFINE(HAVE_CHARSET_win1250ch)
       ;;
     win1251)
       AC_DEFINE(HAVE_CHARSET_win1251)

--- 1.28/include/m_ctype.h	Sat Apr 13 17:34:36 2002
+++ 1.29/include/m_ctype.h	Wed Apr 17 14:16:21 2002
@@ -158,6 +158,21 @@
                           char *, char *, uint *, uint *);
 #endif
 
+
+#ifdef HAVE_CHARSET_win1250ch
+/* declarations for the win1250ch character set */
+extern uchar ctype_win1250ch[];
+extern uchar to_lower_win1250ch[];
+extern uchar to_upper_win1250ch[];
+extern uchar sort_order_win1250ch[];
+extern int     my_strnncoll_win1250ch(CHARSET_INFO *, const uchar *, uint, const uchar *,
uint);
+extern int     my_strnxfrm_win1250ch(CHARSET_INFO *, uchar *, uint, const uchar *, uint);
+extern my_bool my_like_range_win1250ch(CHARSET_INFO *, 
+                          const char *, uint, pchar, uint,
+                          char *, char *, uint *, uint *);
+#endif
+
+
 #ifdef HAVE_CHARSET_euc_kr
 /* declarations for the euc_kr character set */
 extern uchar ctype_euc_kr[], to_lower_euc_kr[], to_upper_euc_kr[], sort_order_euc_kr[];

--- 1.12/sql/share/charsets/Index	Thu Mar 28 17:31:38 2002
+++ 1.13/sql/share/charsets/Index	Wed Apr 17 14:16:21 2002
@@ -38,3 +38,4 @@
 latin1_de	  31
 armscii8	  32
 utf8		  33
+win1250ch	  34

--- 1.20/strings/Makefile.am	Sat Apr 13 16:01:41 2002
+++ 1.21/strings/Makefile.am	Wed Apr 17 14:16:21 2002
@@ -22,26 +22,26 @@
 # Exact one of ASSEMBLER_X
 if ASSEMBLER_x86
 ASRCS		= strings-x86.s longlong2str-x86.s
-CSRCS		= bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c
atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c
ctype-simple.c ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c
ctype-gbk.c ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c
+CSRCS		= bfill.c bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c
atof.c bcmp.c strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c
ctype-simple.c ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c
ctype-gbk.c ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c
ctype-win1250ch.c
 else
 if ASSEMBLER_sparc
 # These file MUST all be on the same line!! Otherwise automake
 # generats a very broken makefile
 ASRCS		= bmove_upp-sparc.s strappend-sparc.s strend-sparc.s strinstr-sparc.s
strmake-sparc.s strmov-sparc.s strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
-CSRCS		= strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c
bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c
strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c
ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-latin1_de.c
ctype-sjis.c ctype-tis620.c ctype-ujis.cctype-utf8.c
+CSRCS		= strcont.c strfill.c strcend.c is_prefix.c longlong2str.c bfill.c bmove.c
bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c strtol.c
strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c ctype-mb.c
ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c ctype-latin1_de.c
ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c
 else
 #no assembler
 ASRCS		=
 # These file MUST all be on the same line!! Otherwise automake
 # generats a very broken makefile
-CSRCS		= strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c
is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c
bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c
strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c
ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c
ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c
+CSRCS		= strxmov.c bmove_upp.c strappend.c strcont.c strend.c strfill.c strcend.c
is_prefix.c strstr.c strinstr.c strmake.c strnmov.c strmov.c longlong2str.c bfill.c
bmove.c bmove512.c bchange.c strxnmov.c int2str.c str2int.c r_strinstr.c atof.c bcmp.c
strtol.c strtoul.c strtoll.c strtoull.c llstr.c strnlen.c ctype.c ctype-simple.c
ctype-mb.c ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-gb2312.c ctype-gbk.c
ctype-latin1_de.c ctype-sjis.c ctype-tis620.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c
 endif
 endif
 
 libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
 noinst_PROGRAMS = conf_to_src
 # Default charset definitions
-EXTRA_DIST =		ctype-big5.c ctype-czech.c ctype-euc_kr.c \
+EXTRA_DIST =		ctype-big5.c ctype-czech.c ctype-euc_kr.c ctype-win1250ch.c \
                         ctype-gb2312.c ctype-gbk.c ctype-sjis.c ctype-utf8.c \
                         ctype-tis620.c ctype-ujis.c ctype-latin1_de.c \
                         strto.c strings-x86.s longlong2str-x86.s \

--- 1.21/strings/ctype.c	Fri Mar 29 21:00:48 2002
+++ 1.22/strings/ctype.c	Wed Apr 17 14:16:21 2002
@@ -2527,6 +2527,9 @@
    88, 65, 65, 65, 65, 80, 69, 67, 68, 73, 73, 73, 73, 77, 77, 70,
    71, 83, 83, 85, 85, 85, 85,247, 88, 92, 92, 92, 92, 96, 91,255
 };
+#endif
+
+#if defined(HAVE_CHARSET_win1250)||defined(HAVE_CHARSET_win1250ch)
 
 static uint16 tab_cp1250_uni[256]={
      0,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -3780,6 +3783,36 @@
     NULL,		/* mbcharlen */
     my_mb_wc_8bit,	/* mb_wc   */
     my_wc_mb_8bit,	/* wc_mb   */
+    my_caseup_str_8bit,
+    my_casedn_str_8bit,
+    my_caseup_8bit,
+    my_casedn_8bit,
+    my_strcasecmp_8bit,
+    my_strncasecmp_8bit,
+    0
+  },
+#endif
+
+#ifdef HAVE_CHARSET_win1250ch
+  {
+    34,				/* number */
+    "win1250ch",		/* name */
+    ctype_win1250ch,
+    to_lower_win1250ch,
+    to_upper_win1250ch,
+    sort_order_win1250ch,
+    tab_cp1250_uni,		/* tab_to_uni   */
+    idx_uni_cp1250,		/* tab_from_uni */
+    2,				/* strxfrm_multiply */
+    my_strnncoll_win1250ch,
+    my_strnxfrm_win1250ch,
+    my_like_range_win1250ch,
+    0,				/* mbmaxlen  */
+    NULL,			/* ismbchar  */
+    NULL,			/* ismbhead  */
+    NULL,			/* mbcharlen */
+    my_mb_wc_8bit,		/* mb_wc   */
+    my_wc_mb_8bit,		/* wc_mb   */
     my_caseup_str_8bit,
     my_casedn_str_8bit,
     my_caseup_8bit,

--- 1.29/libmysql/Makefile.shared	Sat Apr 13 16:01:37 2002
+++ 1.30/libmysql/Makefile.shared	Wed Apr 17 14:16:21 2002
@@ -39,7 +39,7 @@
 			bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \
 			strtoull.lo strtoll.lo llstr.lo \
 			ctype.lo ctype-simple.lo ctype-mb.lo \
-			ctype-big5.lo ctype-czech.lo ctype-euc_kr.lo \
+			ctype-big5.lo ctype-czech.lo ctype-euc_kr.lo ctype-win1250ch.lo\
 			ctype-gb2312.lo ctype-gbk.lo ctype-latin1_de.lo \
 			ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo ctype-utf8.lo