diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-02-28 22:23:35 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-02-28 22:23:35 +0200 |
| commit | def9c0b2367808d6e8f6b9ffe2f82f6465d9642b (patch) | |
| tree | 288ffce0d7e95cc7177686fa96f53632b56e4161 /sql/log.cc | |
| parent | 8c336fbc46fd3e8d1a7cc073883270c5a2ac3cc8 (diff) | |
| download | mariadb-git-def9c0b2367808d6e8f6b9ffe2f82f6465d9642b.tar.gz | |
Fixed compiler warnings.
client/mysql_upgrade.c:
Fixed problem with mysql_upgrade being dependent
on local my.cnf files and problem with memory not being freed.
client/mysqltest.c:
Changed type to avoid warning.
cmd-line-utils/readline/xmalloc.c:
Fix to avoid warning.
include/my_dbug.h:
To disable parts from code in non-debug more.
sql/field.cc:
Fixed warning.
sql/ha_archive.cc:
Fixed warning.
sql/ha_berkeley.cc:
Added casts to avoid warnings.
sql/ha_ndbcluster.cc:
Fixed warnings.
sql/log.cc:
Added casts to avoid warnings.
sql/slave.cc:
Avoid warning.
sql/sql_repl.cc:
Avoid warning.
support-files/compiler_warnings.supp:
Added disabled warnings to compiler_warnings.supp file.
These are backported mainly from 5.1 suppress file, but there
are some additional new ones.
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 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); } |