diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-02-13 11:41:47 -0500 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-02-13 11:41:47 -0500 |
| commit | 5b7347bda31b9d66cd78937e5dc339f553b9a736 (patch) | |
| tree | 85b39362efeae16536a90f3a3624acd6916d4305 /sql/log_event.h | |
| parent | 50b19265ffcf4e4708c86345a5c166c58dbdb523 (diff) | |
| parent | 54fbbf9591e21cda9f7b26c2d795d88f51827f07 (diff) | |
| download | mariadb-git-5b7347bda31b9d66cd78937e5dc339f553b9a736.tar.gz | |
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings
that are covered by the ignore file: support-files/compiler_warnings.supp.
- Strings are guaranteed to be max uint in length
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 1d11d7e2d5f..8f8fde4c9db 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -3314,7 +3314,7 @@ public: virtual Log_event_type get_type_code() { return TABLE_MAP_EVENT; } virtual bool is_valid() const { return m_memory != NULL; /* we check malloc */ } - virtual int get_data_size() { return m_data_size; } + virtual int get_data_size() { return (uint) m_data_size; } #ifndef MYSQL_CLIENT virtual int save_field_metadata(); virtual bool write_data_header(IO_CACHE *file); @@ -3897,7 +3897,7 @@ public: return m_incident > INCIDENT_NONE && m_incident < INCIDENT_COUNT; } virtual int get_data_size() { - return INCIDENT_HEADER_LEN + 1 + m_message.length; + return INCIDENT_HEADER_LEN + 1 + (uint) m_message.length; } private: |