maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2846
committer: bo.thorsen <bo@xxxxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-04-09 11:05:23 +0200
message:
  Fix Windows compile
modified:
  sql/mysqld.cc
  storage/maria/ma_loghandler.c


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription

=== modified file 'sql/mysqld.cc'
--- sql/mysqld.cc	2010-04-06 22:47:08 +0000
+++ sql/mysqld.cc	2010-04-09 09:05:23 +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-04-08 09:47:31 +0000
+++ storage/maria/ma_loghandler.c	2010-04-09 09:05:23 +0000
@@ -1397,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))))
     {