bk commit into 5.1 tree (jmiller:1.2385)

[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.2385 06/05/11 18:12:06 jmiller@stripped +5 -0
  changes for when NDB is default engine

  mysql-test/t/rpl_row_basic_11bugs.test
    1.5 06/05/11 17:57:58 jmiller@stripped +4 -0
    Disables for when ndb is default as the show binlog events will cause failure

  mysql-test/t/rpl_multi_engine.test
    1.6 06/05/11 17:53:20 jmiller@stripped +3 -0
    Results will not match when ndb is default do to myisam table creates and show create

  mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
    1.15 06/05/11 17:44:41 jmiller@stripped +4 -0
    Updated to skip when ndb is default

  mysql-test/r/rpl_sp004.result
    1.2 06/05/11 16:36:53 jmiller@stripped +8 -8
    updated to work with default NDB engine

  mysql-test/t/rpl_sp004.test
    1.4 06/05/11 16:36:38 jmiller@stripped +8 -8
    updated to work with default NDB engine

# 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.14/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test	2006-02-24 16:19:47 +01:00
+++ 1.15/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test	2006-05-11 17:44:41 +02:00
@@ -3,6 +3,10 @@
 # RENAME TABLE work with MERGE tables on the slave.
 # 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
 
 create table t1 (a int);

--- 1.1/mysql-test/r/rpl_sp004.result	2005-12-22 06:34:57 +01:00
+++ 1.2/mysql-test/r/rpl_sp004.result	2006-05-11 16:36:53 +02:00
@@ -26,25 +26,25 @@
 INSERT INTO test.t3 VALUES(NULL,11111111.233333,NOW());
 END|
 CALL test.p1();
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a;
 a
 1
 2
 3
 12
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 a
 1
 2
 3
 8
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a;
 a
 1
 2
 3
 12
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 a
 1
 2
@@ -62,25 +62,25 @@
 CALL test.p1();
 Warnings:
 Note	1050	Table 't3' already exists
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a;
 a
 1
 2
 3
 12
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 a
 1
 2
 3
 8
-SELECT * FROM test.t1;
+SELECT * FROM test.t1 ORDER BY a;
 a
 1
 2
 3
 12
-SELECT * FROM test.t2;
+SELECT * FROM test.t2 ORDER BY a;
 a
 1
 2

--- 1.5/mysql-test/t/rpl_multi_engine.test	2006-01-11 11:35:18 +01:00
+++ 1.6/mysql-test/t/rpl_multi_engine.test	2006-05-11 17:53:20 +02:00
@@ -1,5 +1,8 @@
 # See if replication between MyISAM, MEMORY and InnoDB works.
 
+# Results files do not match when ndb is default
+-- source include/not_ndb_default.inc
+
 -- source include/master-slave.inc
 
 connection slave;

--- 1.3/mysql-test/t/rpl_sp004.test	2006-02-22 10:07:31 +01:00
+++ 1.4/mysql-test/t/rpl_sp004.test	2006-05-11 16:36:38 +02:00
@@ -44,13 +44,13 @@
 delimiter ;|
 
 CALL test.p1();
-SELECT * FROM test.t1;
-SELECT * FROM test.t2;
+SELECT * FROM test.t1 ORDER BY a;
+SELECT * FROM test.t2 ORDER BY a;
 save_master_pos;
 connection slave;
 sync_with_master;
-SELECT * FROM test.t1;
-SELECT * FROM test.t2;
+SELECT * FROM test.t1 ORDER BY a;
+SELECT * FROM test.t2 ORDER BY a;
 
 connection master;
 CALL test.p2();
@@ -66,14 +66,14 @@
 
 connection master;
 CALL test.p1();
-SELECT * FROM test.t1;
-SELECT * FROM test.t2;
+SELECT * FROM test.t1 ORDER BY a;
+SELECT * FROM test.t2 ORDER BY a;
 #SELECT * FROM test.t3;
 save_master_pos;
 connection slave;
 sync_with_master;
-SELECT * FROM test.t1;
-SELECT * FROM test.t2;
+SELECT * FROM test.t1 ORDER BY a;
+SELECT * FROM test.t2 ORDER BY a;
 #SELECT * FROM test.t3;
 
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql

--- 1.4/mysql-test/t/rpl_row_basic_11bugs.test	2006-02-24 16:31:32 +01:00
+++ 1.5/mysql-test/t/rpl_row_basic_11bugs.test	2006-05-11 17:57:58 +02:00
@@ -1,5 +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
+-- source include/not_ndb_default.inc
+
 --source include/master-slave.inc
 
 # Bug#15942 (RBR ignores --binlog_ignore_db and tries to map to table