bk commit into 5.1 tree (tomas:1.2563)

[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-07-13 22:21:19+02:00, tomas@stripped +3 -0
  avoid multiple defines of server1/2

  mysql-test/include/ndb_master-slave.inc@stripped, 2007-07-13 22:21:16+02:00, tomas@stripped +6 -1
    avoid multiple defines of server1/2

  mysql-test/t/ndb_multi.test@stripped, 2007-07-13 22:21:16+02:00, tomas@stripped +0 -1
    avoid multiple defines of server1/2

  mysql-test/t/ndb_multi_row.test@stripped, 2007-07-13 22:21:16+02:00, tomas@stripped +0 -1
    avoid multiple defines of server1/2

# 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-new-ndb

--- 1.18/mysql-test/t/ndb_multi.test	2007-02-26 14:16:47 +01:00
+++ 1.19/mysql-test/t/ndb_multi.test	2007-07-13 22:21:16 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 

--- 1.4/mysql-test/t/ndb_multi_row.test	2007-02-28 20:33:57 +01:00
+++ 1.5/mysql-test/t/ndb_multi_row.test	2007-07-13 22:21:16 +02:00
@@ -1,4 +1,3 @@
--- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 -- source include/have_binlog_format_row.inc

--- 1.1/mysql-test/include/ndb_master-slave.inc	2007-06-18 15:36:07 +02:00
+++ 1.2/mysql-test/include/ndb_master-slave.inc	2007-07-13 22:21:16 +02:00
@@ -4,7 +4,12 @@
 connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
 
 connection slave;
--- source include/have_ndb.inc
+# Check that server is compiled and started with support for NDB
+disable_query_log;
+--require r/true.require
+select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
+--source include/ndb_not_readonly.inc
+enable_query_log;
 
 -- source include/master-slave-reset.inc