List:Commits« Previous MessageNext Message »
From:Vladislav Vaintroub Date:June 20 2008 12:28am
Subject:bzr push into mysql-6.0-wtf branch (vvaintroub:2658 to 2659)
View as plain text  
 2659 Vladislav Vaintroub	2008-06-20
      Fix Visual Studio 2003 build.
      struct __stat64-> struct _stati64
modified:
  include/my_dir.h
  mysys/my_winfile.c

 2658 Vladislav Vaintroub	2008-06-19 [merge]
      something I merged
modified:
  mysql-test/lib/mtr_cases.pl
  mysql-test/r/repair.result
  scripts/make_binary_distribution.sh
  sql/sql_plugin.cc
  sql/sql_table.cc

=== modified file 'include/my_dir.h'
--- a/include/my_dir.h	2008-06-17 23:37:23 +0000
+++ b/include/my_dir.h	2008-06-20 00:27:48 +0000
@@ -70,7 +70,7 @@ typedef struct my_stat
 #else
 
 #if(_MSC_VER)
-#define MY_STAT struct __stat64 /* 64 bit file size and timestamp */
+#define MY_STAT struct _stati64 /* 64 bit file size */
 #else
 #define MY_STAT struct stat	/* Orginal struct have what we need */
 #endif

=== modified file 'mysys/my_winfile.c'
--- a/mysys/my_winfile.c	2008-06-17 23:37:23 +0000
+++ b/mysys/my_winfile.c	2008-06-20 00:27:48 +0000
@@ -585,7 +585,7 @@ int my_win_fclose(FILE *file)
   Patch file size, because size that fstat returns is not 
   reliable (may be outdated)
 */
-int my_win_fstat(File fd, struct _stat64 *buf)
+int my_win_fstat(File fd, struct _stati64 *buf)
 {
   int crt_fd;
   int retval;
@@ -615,7 +615,7 @@ int my_win_fstat(File fd, struct _stat64
 
 
 
-int my_win_stat( const char *path, struct _stat64 *buf)
+int my_win_stat( const char *path, struct _stati64 *buf)
 {
   DBUG_ENTER("my_win_stat");
   if(_stati64( path, buf) == 0)

Thread
bzr push into mysql-6.0-wtf branch (vvaintroub:2658 to 2659) Vladislav Vaintroub20 Jun