summaryrefslogtreecommitdiff
path: root/sql/sql_repl.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-08-23 00:55:48 +0300
committerunknown <monty@hundin.mysql.fi>2001-08-23 00:55:48 +0300
commit29ebdeb11ccbf43c5b0a3179bed602828eb36149 (patch)
treef6e213bc452d9b3c37cd161c3099c3e079f9c9d4 /sql/sql_repl.cc
parent6bf6d4b8a583d3b7b745cd882a07ad1bd93977e7 (diff)
downloadmariadb-git-29ebdeb11ccbf43c5b0a3179bed602828eb36149.tar.gz
Portability fixes
Docs/manual.texi: Small changes because of user request. heap/heapdef.h: Portability fix include/global.h: Portability fix myisam/myisamlog.c: Portability fix sql/mini_client.cc: Fix for windows sql/sql_repl.cc: Fix for windows sql/violite.c: Fix for windows
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r--sql/sql_repl.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 32c4c5c6509..b9ba284ab27 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -620,6 +620,9 @@ int stop_slave(THD* thd, bool net_report )
#ifdef HAVE_TIMESPEC_TS_SEC
abstime.ts_sec=time(NULL)+2;
abstime.ts_nsec=0;
+#elif defined(__WIN__)
+ abstime.tv_sec=time((time_t*) 0)+2;
+ abstime.tv_nsec=0;
#else
struct timeval tv;
gettimeofday(&tv,0);