bzr push into mysql-6.0-backup branch (ingo.struewing:2810 to 2811)

[Ingo Struewing]

 2811 Ingo Struewing	2009-05-22
      Post-pushbuild fix.
      Fixed compiler warnings.
     @ include/my_dir.h
        Post-pushbuild fix.
        Fixed compiler warnings.
     @ mysys/mf_pack.c
        Post-pushbuild fix.
        Fixed compiler warnings.
     @ mysys/my_lib.c
        Post-pushbuild fix.
        Fixed compiler warnings.

    modified:
      include/my_dir.h
      mysys/mf_pack.c
      mysys/my_lib.c
 2810 Ingo Struewing	2009-05-22 [merge]
      auto-merge

    modified:
      mysql-test/suite/backup/r/backup_external.result
      mysql-test/suite/backup/t/backup_external.test
      sql/share/errmsg.txt
      sql/si_objects.cc
=== modified file 'include/my_dir.h'
--- a/include/my_dir.h	2009-04-24 14:55:53 +0000
+++ b/include/my_dir.h	2009-05-22 21:10:24 +0000
@@ -101,6 +101,7 @@ extern void my_dirend(MY_DIR *buffer);
 extern MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags);
 extern int my_fstat(int filenr, MY_STAT *stat_area, myf MyFlags);
 extern my_bool test_if_directory(const char* path);
+extern my_bool test_if_real_directory(const char* path);
 
 #endif /* MY_DIR_H */
 

=== modified file 'mysys/mf_pack.c'
--- a/mysys/mf_pack.c	2009-05-19 09:48:45 +0000
+++ b/mysys/mf_pack.c	2009-05-22 21:10:24 +0000
@@ -15,6 +15,7 @@
 
 #include "mysys_priv.h"
 #include <m_string.h>
+#include <my_dir.h>
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif

=== modified file 'mysys/my_lib.c'
--- a/mysys/my_lib.c	2009-05-19 09:48:45 +0000
+++ b/mysys/my_lib.c	2009-05-22 21:10:24 +0000
@@ -593,12 +593,11 @@ MY_STAT *my_stat(const char *path, MY_ST
   else
 #endif
     res= stat((char *) path, (struct stat *) stat_area);
-  if (!res)
-    DBUG_RETURN(stat_area);
 #else
-    if (! my_win_stat(path, stat_area) )
-      DBUG_RETURN(stat_area);
+  res= my_win_stat(path, stat_area);
 #endif
+  if (!res)
+    DBUG_RETURN(stat_area);
   DBUG_PRINT("error",("Got errno: %d from stat", errno));
   my_errno= errno;
   if (m_used)					/* Free if new area */


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