diff options
| author | bo.thorsen <bo@sonofthor.dk> | 2010-04-09 11:05:23 +0200 |
|---|---|---|
| committer | bo.thorsen <bo@sonofthor.dk> | 2010-04-09 11:05:23 +0200 |
| commit | efa54f633ffebf9dfde9e32af2a2710ccabefe02 (patch) | |
| tree | a6c201e2229cb559e3b1327ffdebcdaea2420ad6 | |
| parent | dd0ec761e8df323f600c4273be8237abf5d635aa (diff) | |
| download | mariadb-git-efa54f633ffebf9dfde9e32af2a2710ccabefe02.tar.gz | |
Fix Windows compile
| -rw-r--r-- | sql/mysqld.cc | 5 | ||||
| -rw-r--r-- | storage/maria/ma_loghandler.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 55a889b55af..645b7498042 100644 --- 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 } diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 8ffaf22d1b0..be86740d822 100644 --- 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)))) { |