diff options
| author | unknown <aivanov@mysql.com> | 2006-01-15 17:41:32 +0300 |
|---|---|---|
| committer | unknown <aivanov@mysql.com> | 2006-01-15 17:41:32 +0300 |
| commit | 1d5a5ae0abb86691df2563df638c7ad93b077af5 (patch) | |
| tree | aac2180bf5a08f5851e46dbd98aa4ca3e52d2ec0 /sql/log_event.cc | |
| parent | eade034f14a0a3351cc9f146d602cbf7ab69dcde (diff) | |
| parent | 8e9cabb1f8c9cfcdde73a0a48e0742c77d38a3a1 (diff) | |
| download | mariadb-git-1d5a5ae0abb86691df2563df638c7ad93b077af5.tar.gz | |
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/alexi/dev/mysql-5.1-studio
sql/log_event.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 04a6276d476..0c95e0ec1ef 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -5123,7 +5123,7 @@ Rows_log_event::Rows_log_event(const char *buf, uint event_len, const uint byte_count= (m_width + 7) / 8; const byte* const ptr_rows_data= var_start + byte_count + 1; - my_size_t const data_size= event_len - (ptr_rows_data - buf); + my_size_t const data_size= event_len - (ptr_rows_data - (const byte *) buf); DBUG_PRINT("info",("m_table_id=%lu, m_flags=%d, m_width=%u, data_size=%lu", m_table_id, m_flags, m_width, data_size)); @@ -6038,7 +6038,7 @@ bool Table_map_log_event::write_data_body(IO_CACHE *file) DBUG_ASSERT(static_cast<my_size_t>(cbuf_end - cbuf) <= sizeof(cbuf)); return (my_b_safe_write(file, dbuf, sizeof(dbuf)) || - my_b_safe_write(file, m_dbnam, m_dblen+1) || + 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) || @@ -6056,7 +6056,7 @@ bool Table_map_log_event::write_data_body(IO_CACHE *file) void Table_map_log_event::pack_info(Protocol *protocol) { char buf[256]; - my_size_t bytes= snprintf(buf, sizeof(buf), "%s.%s", m_dbnam, m_tblnam); + my_size_t bytes= my_snprintf(buf, sizeof(buf), "%s.%s", m_dbnam, m_tblnam); protocol->store(buf, bytes, &my_charset_bin); } @@ -6171,7 +6171,7 @@ char const *Write_rows_log_event::do_prepare_row(THD *thd, TABLE *table, */ DBUG_ASSERT(table->s->fields >= m_width); DBUG_ASSERT(ptr); - ptr= unpack_row(table, (char*)table->record[0], ptr, &m_cols); + ptr= unpack_row(table, table->record[0], ptr, &m_cols); return ptr; } |