bk commit into 5.1 tree (jonas:1.2246) BUG#21283

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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, 2006-08-10 13:33:49+02:00, jonas@stripped +1 -0
  ndb - bug#21283
    this test in its current form depend on binlog format row

  mysql-test/t/ndb_autodiscover3.test@stripped, 2006-08-10 13:33:48+02:00, jonas@stripped +3 -0
    ndb - bug#21283
      this test in its current form depend on binlog format row

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new-ndb

--- 1.6/mysql-test/t/ndb_autodiscover3.test	2006-08-10 13:33:54 +02:00
+++ 1.7/mysql-test/t/ndb_autodiscover3.test	2006-08-10 13:33:54 +02:00
@@ -2,6 +2,9 @@
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 
+# see bug#21563
+-- source include/have_binlog_format_row.inc
+
 --disable_warnings
 drop table if exists t1, t2;
 --enable_warnings