diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-02 14:46:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-02 14:46:00 +0200 |
| commit | fa078616e576fef6ab93e5c6d9ac3c364caf70db (patch) | |
| tree | 5fe09cf0dccde91fd112fe0b5f5d2fda405c4e55 | |
| parent | a765e61b33c1682ab266da89200f8616474e530a (diff) | |
| parent | de16b292976cf64cd629c0be6d8eb6495a473885 (diff) | |
| download | mariadb-git-fa078616e576fef6ab93e5c6d9ac3c364caf70db.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
| -rw-r--r-- | sql/log.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 94c744f3f93..c7b65071114 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3891,7 +3891,7 @@ void MYSQL_BIN_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 d6efebd32c4..61de1fdcd7f 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3485,7 +3485,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); } @@ -6866,6 +6866,7 @@ SHOW_VAR status_vars[]= { {"Com_analyze", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_ANALYZE]), SHOW_LONG_STATUS}, {"Com_backup_table", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_BACKUP_TABLE]), SHOW_LONG_STATUS}, {"Com_begin", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_BEGIN]), SHOW_LONG_STATUS}, + {"Com_call_procedure", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CALL]), SHOW_LONG_STATUS}, {"Com_change_db", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CHANGE_DB]), SHOW_LONG_STATUS}, {"Com_change_master", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CHANGE_MASTER]), SHOW_LONG_STATUS}, {"Com_check", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_CHECK]), SHOW_LONG_STATUS}, |