bk commit into 5.1 tree (jmiller:1.2094)

[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.2094 06/02/08 23:06:01 jmiller@stripped +2 -0
  rpl_ndb_sync.result, rpl_ndb_sync.test:
    Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you were right

  mysql-test/r/rpl_ndb_sync.result
    1.2 06/02/08 23:05:25 jmiller@stripped +1 -1
    Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you where right

  mysql-test/t/rpl_ndb_sync.test
    1.3 06/02/08 23:05:14 jmiller@stripped +1 -1
    Fixed bug in test for when NDB is set to default engine - Thanks Tomas, you where right

# 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.1/mysql-test/r/rpl_ndb_sync.result	2006-01-12 19:50:41 +01:00
+++ 1.2/mysql-test/r/rpl_ndb_sync.result	2006-02-08 23:05:25 +01:00
@@ -25,7 +25,7 @@
 0	1	BCDEF
 1	0	CD
 0	0	DEFGHIJKL
-CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT);
+CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
 DELETE FROM cluster_replication.backup_info;
 LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
 SELECT @the_backup_id:=backup_id FROM cluster_replication.backup_info;

--- 1.2/mysql-test/t/rpl_ndb_sync.test	2006-01-17 13:09:13 +01:00
+++ 1.3/mysql-test/t/rpl_ndb_sync.test	2006-02-08 23:05:14 +01:00
@@ -27,7 +27,7 @@
 # take a backup on master
 --exec $NDB_MGM --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -e "start backup" >> $NDB_TOOLS_OUTPUT
 --exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT" -d sys --delimiter=',' SYSTAB_0 | grep 520093696 > var/tmp.dat
-CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT);
+CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT)ENGINE=HEAP;
 DELETE FROM cluster_replication.backup_info;
 LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE cluster_replication.backup_info FIELDS TERMINATED BY ',';
 --replace_column 1 <the_backup_id>