summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorjani@ua141d10.elisa.omakaista.fi <>2007-02-28 22:23:35 +0200
committerjani@ua141d10.elisa.omakaista.fi <>2007-02-28 22:23:35 +0200
commitbcbc0031ebf001dd53e4322aeda67267c5ce3d03 (patch)
tree288ffce0d7e95cc7177686fa96f53632b56e4161 /sql/log.cc
parent01ea1aa44d4d1ab0abb288f8b6b4627c19a052c9 (diff)
downloadmariadb-git-bcbc0031ebf001dd53e4322aeda67267c5ce3d03.tar.gz
Fixed compiler warnings.
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 05c6a548e28..a6c02d10732 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -304,7 +304,7 @@ void setup_windows_event_source()
/* Register EventMessageFile */
dwError = RegSetValueEx(hRegKey, "EventMessageFile", 0, REG_EXPAND_SZ,
- (PBYTE) szPath, strlen(szPath)+1);
+ (PBYTE) szPath, (DWORD) (strlen(szPath) + 1));
/* Register supported event types */
dwTypes= (EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE |
@@ -1784,7 +1784,7 @@ void MYSQL_LOG::rotate_and_purge(uint flags)
#ifdef HAVE_REPLICATION
if (expire_logs_days)
{
- long purge_time= time(0) - expire_logs_days*24*60*60;
+ long purge_time= (long) (time(0) - expire_logs_days*24*60*60);
if (purge_time >= 0)
purge_logs_before_date(purge_time);
}