diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-03-01 11:37:28 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-03-01 11:37:28 +0100 |
| commit | 3616b5e3d574de6863cb9aaa6a642ba67401956b (patch) | |
| tree | 9c6b344e3bab621639e474eac71b652c6543833c /sql/log.cc | |
| parent | 92e7cf15591bbb8508ae4f57962591d9c0072b85 (diff) | |
| parent | a7ec72b21b97a38be4374b79bcc33c69a7bbf3e3 (diff) | |
| download | mariadb-git-3616b5e3d574de6863cb9aaa6a642ba67401956b.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
sql/field.cc:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 56ebb5bd71c..c44d3a58a81 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); } |