diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:03:00 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 16:03:00 +0100 |
| commit | 101c30ccc48d38c3ea98ebd89a350120a45aa591 (patch) | |
| tree | 5718a5af3c09c59f20c1a2cca72da33e9c852e55 /sql/slave.cc | |
| parent | 817bfa350c6ea2464f1357969f17acd08b909e14 (diff) | |
| download | mariadb-git-101c30ccc48d38c3ea98ebd89a350120a45aa591.tar.gz | |
Post-merge changes.
BitKeeper/deleted/.del-show_binlog_events2.inc:
Delete: mysql-test/include/show_binlog_events2.inc
client/mysqlbinlog.cc:
char -> uchar for raw memory.
sql/item_cmpfunc.cc:
Adding cast to remove warning when converting negative integer
to unsigned type.
sql/log_event.cc:
char -> uchar for raw memory.
sql/log_event.h:
char -> uchar for raw memory.
sql/rpl_utility.cc:
Adding cast to remove warning when converting negative integer
to unsigned type.
sql/slave.cc:
char -> uchar for raw memory.
sql/sql_repl.cc:
char -> uchar for raw memory.
sql-common/client.c:
char -> uchar for raw memory.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 14fa1c45c36..75e16e149fa 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2823,7 +2823,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev) } if (unlikely(cev_not_written)) { - cev->block = (char*)net->read_pos; + cev->block = net->read_pos; cev->block_len = num_bytes; if (unlikely(mi->rli.relay_log.append(cev))) { @@ -2837,7 +2837,7 @@ static int process_io_create_file(Master_info* mi, Create_file_log_event* cev) } else { - aev.block = (char*)net->read_pos; + aev.block = net->read_pos; aev.block_len = num_bytes; aev.log_pos = cev->log_pos; if (unlikely(mi->rli.relay_log.append(&aev))) |