diff options
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index acad297cda1..bfee5f9235b 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1023,11 +1023,11 @@ err: int log_loaded_block(IO_CACHE* file) { LOAD_FILE_INFO* lf_info; - uint block_len ; + ulong block_len ; /* file->request_pos contains position where we started last read */ - char* buffer = (char*) file->request_pos; - if (!(block_len = file->read_end - buffer)) + byte *buffer = file->request_pos; + if (!(block_len = (ulong) (file->read_end - buffer))) return 0; lf_info = (LOAD_FILE_INFO*)file->arg; if (lf_info->last_pos_in_file != HA_POS_ERROR && @@ -1036,14 +1036,14 @@ int log_loaded_block(IO_CACHE* file) lf_info->last_pos_in_file = file->pos_in_file; if (lf_info->wrote_create_file) { - Append_block_log_event a(lf_info->thd, buffer, block_len); + Append_block_log_event a(lf_info->thd, (char*) buffer, block_len); mysql_bin_log.write(&a); } else { Create_file_log_event c(lf_info->thd,lf_info->ex,lf_info->db, lf_info->table_name, *lf_info->fields, - lf_info->handle_dup, buffer, + lf_info->handle_dup, (char*) buffer, block_len); mysql_bin_log.write(&c); lf_info->wrote_create_file = 1; |