maria-developers team mailing list archive

[Bo Thorsen <bo@xxxxxxxxxxxx>]

Hi all,

When compiling lp:maria on windows, there are a couple of errors. The 
attached patch fixes those.

Part of this patch fixes https://bugs.launchpad.net/maria/+bug/550974, 
and it's done the way Sanja suggested.

Bo.

=== modified file sql/mysqld.cc
--- sql/mysqld.cc	2010-04-06 22:47:08 +0000
+++ sql/mysqld.cc	2010-04-07 12:12:49 +0000
@@ -2664,8 +2664,11 @@
 
 end:
 #ifndef __WIN__
+  /* Terminate */
+  exit(1);
+#else
   /* On Windows, do not terminate, but pass control to exception filter */
-  exit(1);
+  ;
 #endif
 }
 

=== modified file storage/maria/ma_loghandler.c
--- storage/maria/ma_loghandler.c	2010-03-30 12:36:49 +0000
+++ storage/maria/ma_loghandler.c	2010-04-07 12:12:49 +0000
@@ -1211,9 +1211,10 @@
   for (file= from_file; file <= to_file; file++)
   {
     LOGHANDLER_FILE_INFO info;
+	File fd;
     LINT_INIT(info.max_lsn);
 
-    File fd= open_logfile_by_number_no_cache(file);
+    fd= open_logfile_by_number_no_cache(file);
     if ((fd < 0) ||
         ((translog_read_file_header(&info, fd) ||
           (cmp_translog_addr(lsn, info.max_lsn) > 0 &&
@@ -1396,8 +1397,9 @@
 
   {
     LOGHANDLER_FILE_INFO info;
+	File fd;
     LINT_INIT_STRUCT(info);
-    File fd= open_logfile_by_number_no_cache(file);
+    fd= open_logfile_by_number_no_cache(file);
     if ((fd < 0) ||
         (translog_read_file_header(&info, fd) | my_close(fd, MYF(MY_WME))))
     {