summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jmiller@mysql.com>2006-01-06 00:07:03 +0100
committerunknown <jmiller@mysql.com>2006-01-06 00:07:03 +0100
commit55b07343f87668bd9d20c8f1533211fdb1c75736 (patch)
tree6dcf786bc4e79150524aa3a06c35498c7da3ff30
parentcdd75f06aa174961a0877bb1a5fd631ac9abf0f4 (diff)
parent53d9981399589cf7ef56cd79863c495764d08329 (diff)
downloadmariadb-git-55b07343f87668bd9d20c8f1533211fdb1c75736.tar.gz
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
-rw-r--r--mysql-test/t/rpl_stm_loaddata_m.test10
1 files changed, 0 insertions, 10 deletions
diff --git a/mysql-test/t/rpl_stm_loaddata_m.test b/mysql-test/t/rpl_stm_loaddata_m.test
deleted file mode 100644
index ac52a8dfb9e..00000000000
--- a/mysql-test/t/rpl_stm_loaddata_m.test
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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