bk commit into 5.2 tree (lars:1.2522)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.2 repository of lthalmann. When lthalmann 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-06-21 13:28:10+02:00, lars@stripped +3 -0
  Post-merge fixes

  include/m_ctype.h@stripped, 2007-06-21 13:28:07+02:00, lars@stripped +10 -10
    Post-merge fixes

  mysql-test/r/ctype_cp932_binlog_stm.result@stripped, 2007-06-21 13:28:07+02:00,
lars@stripped +1 -4
    Post-merge fixes

  strings/ctype-big5.c@stripped, 2007-06-21 13:28:07+02:00, lars@stripped +1 -1
    Post-merge fixes

# 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:	lars
# Host:	dl145j.mysql.com
# Root:	/nfsdisk1/lars/bk/mysql-5.2-rpl

--- 1.137/include/m_ctype.h	2007-06-21 13:28:17 +02:00
+++ 1.138/include/m_ctype.h	2007-06-21 13:28:17 +02:00
@@ -168,7 +168,7 @@ typedef struct my_collation_handler_st
   int     (*strnxfrm)(struct charset_info_st *,
 		      uchar *dst, size_t dstlen, uint nweights,
 		      const uchar *src, size_t srclen, uint flags);
-  uint    (*strnxfrmlen)(struct charset_info_st *, size_t);
+  size_t    (*strnxfrmlen)(struct charset_info_st *, size_t);
   my_bool (*like_range)(struct charset_info_st *,
 			const char *s, size_t s_length,
 			pchar w_prefix, pchar w_one, pchar w_many, 
@@ -341,10 +341,10 @@ extern CHARSET_INFO my_charset_cp1250_cz
 extern CHARSET_INFO my_charset_filename;
 
 /* declarations for simple charsets */
-extern int  my_strnxfrm_simple(CHARSET_INFO *,
+extern size_t my_strnxfrm_simple(CHARSET_INFO *,
                                uchar *dst, size_t dstlen, uint nweights,
                                const uchar *src, size_t srclen, uint flags);
-uint  my_strnxfrmlen_simple(CHARSET_INFO *, size_t);
+size_t my_strnxfrmlen_simple(CHARSET_INFO *, size_t);
 extern int  my_strnncoll_simple(CHARSET_INFO *, const uchar *, size_t,
 				const uchar *, size_t, my_bool);
 
@@ -479,13 +479,13 @@ uint my_instr_mb(struct charset_info_st 
                  my_match_t *match, uint nmatch);
 
 int my_strnncoll_mb_bin(CHARSET_INFO * cs,
-                        const uchar *s, uint slen,
-                        const uchar *t, uint tlen,
+                        const uchar *s, size_t slen,
+                        const uchar *t, size_t tlen,
                         my_bool t_is_prefix);
 
 int my_strnncollsp_mb_bin(CHARSET_INFO *cs,
-                          const uchar *a, uint a_length, 
-                          const uchar *b, uint b_length,
+                          const uchar *a, size_t a_length,
+                          const uchar *b, size_t b_length,
                           my_bool diff_if_only_endspace_difference);
 
 int my_wildcmp_mb_bin(CHARSET_INFO *cs,
@@ -497,11 +497,11 @@ int my_strcasecmp_mb_bin(CHARSET_INFO * 
                          const char *s, const char *t);
 
 void my_hash_sort_mb_bin(CHARSET_INFO *cs __attribute__((unused)),
-                         const uchar *key, uint len,ulong *nr1, ulong *nr2);
+                         const uchar *key, size_t len,ulong *nr1, ulong *nr2);
 
 int  my_strnxfrm_mb(CHARSET_INFO *,
-                    uchar *dst, uint dstlen, uint nweights,
-                    const uchar *src, uint srclen, uint flags); 
+                    uchar *dst, size_t dstlen, uint nweights,
+                    const uchar *src, size_t srclen, uint flags);
 
 int my_wildcmp_unicode(CHARSET_INFO *cs,
                        const char *str, const char *str_end,

--- 1.93/strings/ctype-big5.c	2007-06-21 13:28:17 +02:00
+++ 1.94/strings/ctype-big5.c	2007-06-21 13:28:17 +02:00
@@ -301,7 +301,7 @@ static int my_strnncollsp_big5(CHARSET_I
 }
 
 
-static size_t
+static int
 my_strnxfrm_big5(CHARSET_INFO *cs,
                  uchar *dst, size_t dstlen, uint nweights,
                  const uchar *src, size_t srclen, uint flags)

--- 1.10/mysql-test/r/ctype_cp932_binlog_stm.result	2007-06-21 13:28:17 +02:00
+++ 1.11/mysql-test/r/ctype_cp932_binlog_stm.result	2007-06-21 13:28:17 +02:00
@@ -46,10 +46,6 @@ master-bin.000001	1091	Query	1	1170	use 
 End of 5.0 tests
 SHOW BINLOG EVENTS FROM 364;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
-End of 5.1 tests
-master-bin.000001	820	Query	1	1039	use `test`; INSERT INTO t4 VALUES (
NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932
0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	1039	Query	1	1128	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1128	Query	1	1207	use `test`; DROP TABLE t4
 set names cp932;
 select @@collation_connection;
 @@collation_connection
@@ -220,3 +216,4 @@ hex(weight_string(cast(0x40814081408140 
 select hex(weight_string(cast(0x4040814081408140 as char) as char(3)));
 hex(weight_string(cast(0x4040814081408140 as char) as char(3)))
 40408140
+End of 5.1 tests