bzr commit into mysql-6.0 branch (chad:2779)

[Chad MILLER]

#At file:///home/cmiller/work/mysqlbzr/mysql-6.0-bugteam/

 2779 Chad MILLER	2008-08-18 [merge]
      Merge from 5.1-bugteam local.
modified:
  mysys/mf_pack.c

=== modified file 'mysys/mf_pack.c'
--- a/mysys/mf_pack.c	2008-07-21 09:17:03 +0000
+++ b/mysys/mf_pack.c	2008-08-18 17:16:28 +0000
@@ -354,7 +354,7 @@ size_t unpack_dirname(char *to, const ch
       length-= (size_t) (suffix-buff)-1;
       if (length+(h_length= strlen(tilde_expansion)) <= FN_REFLEN)
       {
-	if (tilde_expansion[h_length-1] == FN_LIBCHAR)
+	if ((h_length > 0) && (tilde_expansion[h_length-1] == FN_LIBCHAR))
 	  h_length--;
 	if (buff+h_length < suffix)
 	  bmove(buff+h_length,suffix,length);