Fix Windows compile

f48e47ea · bo.thorsen · 5b8c42d9 · f48e47ea · f48e47ea
Commit f48e47ea authored Apr 09, 2010 by bo.thorsen
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

sql/mysqld.cc sql/mysqld.cc +4 -1

storage/maria/ma_loghandler.c storage/maria/ma_loghandler.c +2 -1

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2664,8 +2664,11 @@ bugs.\n");
 end:
 #ifndef __WIN__
-  /* On Windows, do not terminate, but pass control to exception filter */
+  /* Terminate */
  exit(1);
+#else
+  /* On Windows, do not terminate, but pass control to exception filter */
+  ;
 #endif
 }

--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -1397,8 +1397,9 @@ LSN translog_get_file_max_lsn_stored(uint32 file)
  {
    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))))
    {