mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
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.
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user