diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-30 18:14:08 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-30 18:14:08 +0200 |
| commit | 1febcfdc0158e59ee5bcdbb2e5292590feb60d9e (patch) | |
| tree | d96da47ac8489967ca05be06146c818f69dd5ed6 | |
| parent | 0f6f3aa0c705e440b29474be5ebd7c8a4e7930ae (diff) | |
| parent | d446289fd6b00c0f806e269e15558677f8458be6 (diff) | |
| download | mariadb-git-1febcfdc0158e59ee5bcdbb2e5292590feb60d9e.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| -rw-r--r-- | sql/log.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 7563d754556..818828f9557 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1784,7 +1784,7 @@ void MYSQL_LOG::rotate_and_purge(uint flags) #ifdef HAVE_REPLICATION if (expire_logs_days) { - long purge_time= (long) (time(0) - expire_logs_days*24*60*60); + time_t purge_time= time(0) - expire_logs_days*24*60*60; if (purge_time >= 0) purge_logs_before_date(purge_time); } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e5abef25b62..17b98803996 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3271,7 +3271,7 @@ server."); #ifdef HAVE_REPLICATION if (opt_bin_log && expire_logs_days) { - long purge_time= (long) (time(0) - expire_logs_days*24*60*60); + time_t purge_time= time(0) - expire_logs_days*24*60*60; if (purge_time >= 0) mysql_bin_log.purge_logs_before_date(purge_time); } |