database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

Browse Source 
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
This commit is contained in:
unknown
2008-01-31 12:32:48 +01:00
parent ee24d7b12d 1fa5131888
commit f7c569901e
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_repl.cc
View File

@@ -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)