mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +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:
@ -270,7 +270,7 @@ public:
|
||||
File prepare_new_file_for_old_format(Load_log_event *le, char *filename);
|
||||
int load_old_format_file(NET* net, const char *server_fname,
|
||||
uint server_fname_len, File file);
|
||||
int process_first_event(const char *bname, uint blen, const char *block,
|
||||
int process_first_event(const char *bname, uint blen, const uchar *block,
|
||||
uint block_len, uint file_id,
|
||||
Create_file_log_event *ce);
|
||||
};
|
||||
@ -375,7 +375,7 @@ int Load_log_processor::load_old_format_file(NET* net, const char*server_fname,
|
||||
*/
|
||||
|
||||
int Load_log_processor::process_first_event(const char *bname, uint blen,
|
||||
const char *block, uint block_len,
|
||||
const uchar *block, uint block_len,
|
||||
uint file_id,
|
||||
Create_file_log_event *ce)
|
||||
{
|
||||
|
Reference in New Issue
Block a user