MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:January 7 2011 7:28pm
Subject:bzr commit into mysql-5.1 branch (davi:3537) Bug#51023
View as plain text  
# At a local mysql-5.1 repository of davi

 3537 Davi Arnaut	2011-01-07
      Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB files
      
      WIN32 compilation fixes: define ETIMEDOUT only if not available and
      fix typos and add a missing parameter.

    modified:
      include/my_pthread.h
      mysys/my_fopen.c
=== modified file 'include/my_pthread.h'
--- a/include/my_pthread.h	2010-10-20 13:40:04 +0000
+++ b/include/my_pthread.h	2011-01-07 19:28:06 +0000
@@ -126,7 +126,9 @@ struct tm *gmtime_r(const time_t *timep,
 
 void pthread_exit(void *a);	 /* was #define pthread_exit(A) ExitThread(A)*/
 
-#define ETIMEDOUT 145		    /* Win32 doesn't have this */
+#ifndef ETIMEDOUT
+#define ETIMEDOUT 145		    /* Win32 might not have this */
+#endif
 #define getpid() GetCurrentThreadId()
 #define HAVE_LOCALTIME_R		1
 #define _REENTRANT			1

=== modified file 'mysys/my_fopen.c'
--- a/mysys/my_fopen.c	2011-01-07 18:33:36 +0000
+++ b/mysys/my_fopen.c	2011-01-07 19:28:06 +0000
@@ -103,17 +103,17 @@ FILE *my_fopen(const char *filename, int
 
 #if defined(_WIN32)
 
-static FILE *my_win_freopen(const char *path, FILE *stream)
+static FILE *my_win_freopen(const char *path, const char *mode, FILE *stream)
 {
   int handle_fd, fd= _fileno(stream);
   HANDLE osfh;
 
-  DBUG_ASSERT(filename && stream);
+  DBUG_ASSERT(path && stream);
 
   /* Services don't have stdout/stderr on Windows, so _fileno returns -1. */
   if (fd < 0)
   {
-    if (!freopen(filename, mode, stream))
+    if (!freopen(path, mode, stream))
       return NULL;
 
     fd= _fileno(stream);


Attachment: [text/bzr-bundle] bzr/davi.arnaut@oracle.com-20110107192806-rmvvxwhk10sy0219.bundle
Thread
bzr commit into mysql-5.1 branch (davi:3537) Bug#51023Davi Arnaut7 Jan