diff options
| author | unknown <kent@mysql.com> | 2006-02-26 01:16:11 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-02-26 01:16:11 +0100 |
| commit | 1e3e30bdc26374d2f16cc67bdff87b172909148d (patch) | |
| tree | 3cf5d4f521d500e1674dc2fb423f64ea7b517f54 /sql/log_event.cc | |
| parent | 1c8bf361f50ea9482eb02a405e7b20c6ca51f0ae (diff) | |
| download | mariadb-git-1e3e30bdc26374d2f16cc67bdff87b172909148d.tar.gz | |
log_event.cc:
Visual C++ dont relate 'byte' and 'char*' that close, added casts
mysql.sln:
Only build mysqlserver.lib if embedded target
VC++Files/mysql.sln:
Only build mysqlserver.lib if embedded target
sql/log_event.cc:
Visual C++ dont relate 'byte' and 'char*' that close, added casts
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 2b335e7b67d..207888ed0a7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -5601,7 +5601,7 @@ bool Rows_log_event::write_data_body(IO_CACHE*file) byte sbuf[sizeof(m_width)]; my_ptrdiff_t const data_size= m_rows_cur - m_rows_buf; - char *const sbuf_end= net_store_length(sbuf, (uint) m_width); + char *const sbuf_end= net_store_length((char*) sbuf, (uint) m_width); DBUG_ASSERT(static_cast<my_size_t>(sbuf_end - (char*) sbuf) <= sizeof(sbuf)); return (my_b_safe_write(file, sbuf, sbuf_end - (char*) sbuf) || @@ -6045,14 +6045,14 @@ bool Table_map_log_event::write_data_body(IO_CACHE *file) byte const tbuf[]= { m_tbllen }; byte cbuf[sizeof(m_colcnt)]; - char *const cbuf_end= net_store_length(cbuf, (uint) m_colcnt); + char *const cbuf_end= net_store_length((char*) cbuf, (uint) m_colcnt); DBUG_ASSERT(static_cast<my_size_t>(cbuf_end - (char*) cbuf) <= sizeof(cbuf)); return (my_b_safe_write(file, dbuf, sizeof(dbuf)) || my_b_safe_write(file, (const byte*)m_dbnam, m_dblen+1) || my_b_safe_write(file, tbuf, sizeof(tbuf)) || my_b_safe_write(file, (const byte*)m_tblnam, m_tbllen+1) || - my_b_safe_write(file, cbuf, cbuf_end - cbuf) || + my_b_safe_write(file, cbuf, cbuf_end - (char*) cbuf) || my_b_safe_write(file, reinterpret_cast<byte*>(m_coltype), m_colcnt)); } #endif |