bzr commit into mysql-5.1-bugteam branch (joro:3210)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/merge-5.1-bugteam/ based on revid:vvaintroub@stripped

 3210 Georgi Kodinov	2009-11-20 [merge]
      merge

    modified:
      configure.in
      mysys/typelib.c
=== modified file 'configure.in'
--- a/configure.in	2009-11-05 09:48:50 +0000
+++ b/configure.in	2009-11-20 13:39:15 +0000
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.41)
+AM_INIT_AUTOMAKE(mysql, 5.1.42)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 # Request support for automake silent-rules if available.

=== modified file 'mysys/typelib.c'
--- a/mysys/typelib.c	2009-10-27 13:16:02 +0000
+++ b/mysys/typelib.c	2009-11-05 20:22:17 +0000
@@ -184,7 +184,7 @@ my_ulonglong find_typeset(char *x, TYPEL
     i= x;
     while (*x && *x != field_separator)
       x++;
-    if (x[0] && x[1])                            // skip separator if found
+    if (x[0] && x[1])                            /* skip separator if found */
       x++;
     if ((find= find_type(i, lib, 2 | 8) - 1) < 0)
       DBUG_RETURN(0);


Attachment: [text/bzr-bundle] bzr/[e-mail]