bzr commit into mysql-pe branch (joro:3697)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/merge-pe/ based on revid:joro@stripped

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

    modified:
      .bzr-mysql/default.conf
      mysys/typelib.c
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-11-12 03:21:14 +0000
+++ b/.bzr-mysql/default.conf	2009-11-20 14:41:54 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-6.0-codebase-bugfixing"
+tree_name = "mysql-pe"

=== modified file 'mysys/typelib.c'
--- a/mysys/typelib.c	2009-10-27 13:34:44 +0000
+++ b/mysys/typelib.c	2009-11-20 14:41:54 +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]