summaryrefslogtreecommitdiff
path: root/sql/mysqlbinlog.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqlbinlog.cc')
-rw-r--r--sql/mysqlbinlog.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/mysqlbinlog.cc b/sql/mysqlbinlog.cc
index 21a740ca1f4..087d1029afb 100644
--- a/sql/mysqlbinlog.cc
+++ b/sql/mysqlbinlog.cc
@@ -361,8 +361,7 @@ static void dump_local_log_entries(const char* logname)
die("Could not read entry at offset %ld : Error in log format or \
read error",
my_b_tell(file));
- else
- die("Could not construct event object");
+ // file->error == 0 means EOF, that's OK, we break in this case
break;
}
if (rec_count >= offset)
@@ -389,7 +388,9 @@ int main(int argc, char** argv)
if(use_remote)
{
+#ifndef __WIN__
init_thr_alarm(10); // need to do this manually
+#endif
mysql = safe_connect();
}