← Back to team overview

maria-developers team mailing list archive

bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2767)

 

#At lp:maria

 2767 knielsen@xxxxxxxxxxxxxxx	2009-11-18 [merge]
      Merge the last bit of MySQL 5.1.41 into MariaDB.
      modified:
        mysys/typelib.c

=== modified file 'mysys/typelib.c'
--- a/mysys/typelib.c	2009-11-16 20:49:51 +0000
+++ b/mysys/typelib.c	2009-11-18 11:47:59 +0000
@@ -192,7 +192,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);