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/sql_repl.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/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 49c4f089298..534a8da645f 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1595,7 +1595,7 @@ int log_loaded_block(IO_CACHE* file) LOAD_FILE_INFO *lf_info; uint block_len; /* buffer contains position where we started last read */ - char* buffer= my_b_get_buffer_start(file); + uchar* buffer= my_b_get_buffer_start(file); uint max_event_size= current_thd->variables.max_allowed_packet; lf_info= (LOAD_FILE_INFO*) file->arg; if (lf_info->thd->current_stmt_binlog_row_based) |