bk commit into 5.1 tree (jmiller:1.2391)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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
  1.2391 06/05/12 14:09:13 jmiller@stripped +4 -0
  rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test:
    Updated per lars
  rpl_row_flsh_tbls.test:
    updated per lars

  mysql-test/t/rpl_row_basic_11bugs.test
    1.6 06/05/12 14:08:49 jmiller@stripped +3 -1
    Updated per lars

  mysql-test/t/rpl_multi_engine.test
    1.7 06/05/12 14:06:54 jmiller@stripped +2 -1
    Updated per lars

  mysql-test/t/rpl_row_flsh_tbls.test
    1.3 06/05/12 14:05:26 jmiller@stripped +5 -0
    updated per lars

  mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
    1.16 06/05/12 14:05:04 jmiller@stripped +0 -2
    Updated per lars

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.15/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test	2006-05-11 17:44:41 +02:00
+++ 1.16/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test	2006-05-12 14:05:04 +02:00
@@ -4,8 +4,6 @@
 # Test of FLUSH NO_WRITE_TO_BINLOG by the way.
 #
 
-# Merge will not work with a default ndb engine
--- source include/not_ndb_default.inc
 
 -- source include/master-slave.inc
 

--- 1.6/mysql-test/t/rpl_multi_engine.test	2006-05-11 17:53:20 +02:00
+++ 1.7/mysql-test/t/rpl_multi_engine.test	2006-05-12 14:06:54 +02:00
@@ -1,6 +1,7 @@
 # See if replication between MyISAM, MEMORY and InnoDB works.
 
-# Results files do not match when ndb is default
+#This test case is not written for NDB, result files do not 
+#match when NDB is the default engine
 -- source include/not_ndb_default.inc
 
 -- source include/master-slave.inc

--- 1.2/mysql-test/t/rpl_row_flsh_tbls.test	2006-03-18 17:15:47 +01:00
+++ 1.3/mysql-test/t/rpl_row_flsh_tbls.test	2006-05-12 14:05:26 +02:00
@@ -6,6 +6,11 @@
 # Bug#18326: Do not lock table for writing during prepare of statement
 # The use of the ps protocol causes extra table maps in the binlog, so
 # we disable the ps-protocol for this statement.
+
+# Merge tables are not supported in NDB
+-- source include/not_ndb_default.inc
+
+
 --disable_ps_protocol
 -- source extra/rpl_tests/rpl_flsh_tbls.test
 --enable_ps_protocol

--- 1.5/mysql-test/t/rpl_row_basic_11bugs.test	2006-05-11 17:57:58 +02:00
+++ 1.6/mysql-test/t/rpl_row_basic_11bugs.test	2006-05-12 14:08:49 +02:00
@@ -1,7 +1,9 @@
 --source include/have_row_based.inc
 --source include/have_binlog_format_row.inc
 
-# Show binlog events will cause failure when ndb is default
+
+#This test case is not written for NDB, the result files 
+#will not match when NDB is the default engine
 -- source include/not_ndb_default.inc
 
 --source include/master-slave.inc