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

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge

mysql-test/include/have_local_infile.inc

+--require r/have_local_infile.require
+disable_query_log;
+show variables like 'local_infile';
+enable_query_log;

mysql-test/r/have_local_infile.require

+Variable_name	Value
+local_infile	ON

mysql-test/suite/rpl/t/rpl_sp.test

@@ -561,7 +561,6 @@ set @a:= mysqltest2.f1();
 sync_slave_with_master;
 connection master;
 
-
 # Final inspection which verifies how all statements of this test file
 # were written to the binary log.
 --replace_column 2 # 5 #
@@ -579,7 +578,7 @@ set global log_bin_trust_function_creators=0;
 # Clean up
 drop database mysqltest;
 drop database mysqltest2;
+sync_slave_with_master;
 
 --echo End of 5.0 tests
 --echo End of 5.1 tests
-

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)