bzr commit into mysql-trunk branch (Dmitry.Shulga:3204) Bug#12403662

[Dmitry Shulga]

#At file:///Users/shulga/projects/mysql/mysql-trunk/ based on revid:vasil.dimov@stripped

 3204 Dmitry Shulga	2011-06-15 [merge]
      Auto-merge of patch for bug#12403662 from mysql-5.5 tree.

    modified:
      mysys/mf_pack.c
=== modified file 'mysys/mf_pack.c'
--- a/mysys/mf_pack.c	2010-12-29 00:26:31 +0000
+++ b/mysys/mf_pack.c	2011-06-15 09:18:08 +0000
@@ -193,7 +193,7 @@ size_t cleanup_dirname(register char *to
 	  while (pos >= start && *pos != FN_LIBCHAR)	/* remove prev dir */
 	    pos--;
           if (pos[1] == FN_HOMELIB ||
-              (pos > start && memcmp(pos, parent, length) == 0))
+              (pos >= start && memcmp(pos, parent, length) == 0))
 	  {					/* Don't remove ~user/ */
 	    pos=strmov(end_parentdir+1,parent);
 	    *pos=FN_LIBCHAR;


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