bk commit into 5.1 tree (tomas:1.2521)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-01 22:19:05+02:00, tomas@stripped +2 -0
  move .inc file to .test file to make it part of distribution

  mysql-test/extra/rpl_tests/rpl_ndb_conflict_1.test@stripped, 2007-06-01 22:09:51+02:00, tomas@stripped +0 -0
    Rename: mysql-test/t/rpl_ndb_conflict_1.inc -> mysql-test/extra/rpl_tests/rpl_ndb_conflict_1.test

  mysql-test/t/rpl_ndb_conflict.test@stripped, 2007-06-01 22:19:02+02:00, tomas@stripped +2 -3
    move .inc file to .test file to make it part of distribution

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco

--- 1.1/mysql-test/t/rpl_ndb_conflict.test	2007-06-01 17:10:35 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_conflict.test	2007-06-01 22:19:02 +02:00
@@ -1,8 +1,7 @@
 --source include/have_ndb.inc
---source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
 --let col_type = int unsigned
---source t/rpl_ndb_conflict_1.inc
+--source extra/rpl_tests/rpl_ndb_conflict_1.test
 --let col_type = bigint unsigned
---source t/rpl_ndb_conflict_1.inc
+--source extra/rpl_tests/rpl_ndb_conflict_1.test