Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
5ffdab00 · jmiller@mysql.com · b41bbfa5 · 35a039ff · b41bbfa5
Commit 5ffdab00 authored Jan 06, 2006 by jmiller@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 10 deletions

mysql-test/t/rpl_stm_loaddata_m.test mysql-test/t/rpl_stm_loaddata_m.test +0 -10

No files found.
--- a/mysql-test/t/rpl_stm_loaddata_m.test
+++ b/mysql-test/t/rpl_stm_loaddata_m.test
-# See if the master logs LOAD DATA INFILE correctly when binlog_*_db rules
-# exist.
-# This is for BUG#1100 (LOAD DATA INFILE was half-logged).
-
-# Requires statement logging
-- source include/have_binlog_format_statement.inc
-- source extra/rpl_tests/rpl_loaddata_m.test
-
-# End of 4.1 tests
-# Adding comment for force manual merge 5.0 -> wl1012: Delete me