From 0246ca928102f4ac53204ca6ae597a9b58359c86 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.blaudden" <> Date: Fri, 27 Apr 2007 15:33:48 +0200 Subject: [PATCH 1/2] Remove dangerous "remove warning" hack, cast to long will truncate the time value on systems where "long" are 32bit, instead use time_t as datatype --- sql/log.cc | 2 +- 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); } From 1675d6f41a9c2718f3c7559bc750193636d5095d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.blaudden" <> Date: Wed, 2 May 2007 14:25:11 +0200 Subject: [PATCH 2/2] Bug#27994 Expose counter for stored procedure calls in Com_% status - Expose the already existing counter for number of stored procedure calls --- sql/mysqld.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 17b98803996..051bad5b310 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6185,6 +6185,7 @@ struct show_var_st 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},