1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki 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
commit f7c569901e
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/have_local_infile.inc Normal file
View File

@ -0,0 +1,4 @@
--require r/have_local_infile.require
disable_query_log;
show variables like 'local_infile';
enable_query_log;

2
mysql-test/r/have_local_infile.require Normal file
View File

@ -0,0 +1,2 @@
Variable_name Value
local_infile ON

3
mysql-test/suite/rpl/t/rpl_sp.test
View File

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

2
sql/sql_repl.cc
View File

@ -1595,7 +1595,7 @@ int log_loaded_block(IO_CACHE* file)
LOAD_FILE_INFO *lf_info; LOAD_FILE_INFO *lf_info;
uint block_len; uint block_len;
/* buffer contains position where we started last read */ /* 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; uint max_event_size= current_thd->variables.max_allowed_packet;
lf_info= (LOAD_FILE_INFO*) file->arg; lf_info= (LOAD_FILE_INFO*) file->arg;
if (lf_info->thd->current_stmt_binlog_row_based) if (lf_info->thd->current_stmt_binlog_row_based)