diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-31 12:32:48 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-31 12:32:48 +0100 |
| commit | f7c569901ee6189771866d5ddd11e2b0c6363461 (patch) | |
| tree | cbf067a90b87af9090fa09f0cae67190a5be74ec /sql/sql_repl.cc | |
| parent | ee24d7b12dff043a30de0ae35a5d01e81d34f53d (diff) | |
| parent | 1fa513188870389442d8483206583f234f9e093a (diff) | |
| download | mariadb-git-f7c569901ee6189771866d5ddd11e2b0c6363461.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
BitKeeper/deleted/.del-binlog_start_comment.test:
Auto merged
mysql-test/suite/rpl/t/rpl_sp.test:
Manual merge
sql/sql_repl.cc:
Manual merge
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 534a8da645f..4c70aa0baf9 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 */ - uchar* buffer= my_b_get_buffer_start(file); + uchar* buffer= (uchar*) 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) |