merge

1 files changed, 7 insertions, 4 deletions

diff --git a/mysql-test/my_manage.c b/mysql-test/my_manage.c
index 1f006f7ab90..88e68dfc27e 100644
--- a/mysql-test/my_manage.c
+++ b/mysql-test/my_manage.c
@@ -122,7 +122,7 @@ void add_arg(arg_list_t *al, const char *format, ...)
     al->argv[al->argc]= malloc(strlen(temp)+1);
     ASSERT(al->argv[al->argc] != NULL);
     strcpy(al->argv[al->argc], temp);
-
+    
     ++(al->argc);
   }
   else
@@ -644,7 +644,7 @@ void del_tree(char *dir)
       if (lstat(entry->d_name, &st) == -1)
       {
         /* FIXME error */
-        return;
+        return;  
       }
       if (S_ISDIR(st.st_mode))
 #else
@@ -800,9 +800,12 @@ int removef(const char *format, ...)
 #ifndef STRUCT_DIRENT_HAS_D_TYPE
     struct stat st;
 
-    if (lstat(entry->d_name, &st) == -1)
+    /* create long name */
+    snprintf(temp, FN_REFLEN, "%s/%s", path, entry->d_name);
+
+    if (lstat(temp, &st) == -1)
     {
-      return 1;
+      return 1;  /* Error couldn't lstat file */
     }
 
     if (!S_ISDIR(st.st_mode) && !fnmatch(p, entry->d_name,0))