bk commit into 5.1 tree (tomas:1.1914)

[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
  1.1914 05/10/06 12:47:40 tomas@stripped +2 -0
  merge

  mysql-test/r/ndb_partition_range.result
    1.4 05/10/06 12:47:33 tomas@stripped +1 -1
    merge

  mysql-test/r/ndb_partition_key.result
    1.5 05/10/06 12:47:33 tomas@stripped +1 -1
    merge

# 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:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1

--- 1.4/mysql-test/r/ndb_partition_key.result	2005-09-21 04:16:19 +02:00
+++ 1.5/mysql-test/r/ndb_partition_key.result	2005-10-06 12:47:33 +02:00
@@ -76,5 +76,5 @@
   `c` int(11) NOT NULL default '0',
   `d` int(11) default NULL,
   PRIMARY KEY  USING HASH (`a`,`b`,`c`)
-) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1 PARTITION BY KEY (b) 
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (b) 
 DROP TABLE t1;

--- 1.3/mysql-test/r/ndb_partition_range.result	2005-09-21 04:16:19 +02:00
+++ 1.4/mysql-test/r/ndb_partition_range.result	2005-10-06 12:47:33 +02:00
@@ -110,5 +110,5 @@
   `c` int(11) NOT NULL,
   PRIMARY KEY  (`b`),
   UNIQUE KEY `a` (`a`)
-) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1 PARTITION BY RANGE (b) (PARTITION x1 VALUES
LESS THAN (5) ENGINE = NDBCLUSTER, PARTITION x2 VALUES LESS THAN (10) ENGINE =
NDBCLUSTER, PARTITION x3 VALUES LESS THAN (20) ENGINE = NDBCLUSTER)
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (b) (PARTITION x1 VALUES
LESS THAN (5) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (10) ENGINE =
ndbcluster, PARTITION x3 VALUES LESS THAN (20) ENGINE = ndbcluster)
 drop table t1;