bk commit into 5.1 tree (jmiller:1.1947)

[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.1947 05/10/27 23:40:00 jmiller@stripped +2 -0
  rpl_ndb_load.result:
    Updated results to match test
  rpl_ndb_sync.test:
    Fixed test to not show errors on CREATE TABle

  mysql-test/r/rpl_ndb_load.result
    1.2 05/10/27 23:38:44 jmiller@stripped +2 -2
    Updated results to match test

  mysql-test/t/rpl_ndb_sync.test
    1.2 05/10/27 23:37:58 jmiller@stripped +2 -0
    Fixed test to not show errors on CREATE TABle

# 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/mysql5.1

--- 1.1/mysql-test/r/rpl_ndb_load.result	2005-07-21 20:35:15 +02:00
+++ 1.2/mysql-test/r/rpl_ndb_load.result	2005-10-27 23:38:44 +02:00
@@ -17,7 +17,7 @@
 CHANGED_TIME CHAR(32) BINARY NOT NULL,
 PRIMARY KEY USING HASH (NUMBER))
 ENGINE = NDB;
-CREATE TABLE GROUP2
+CREATE TABLE GROUP_T
 ( GROUP_ID     INT UNSIGNED NOT NULL,
 GROUP_NAME   CHAR(32) BINARY NOT NULL,
 ALLOW_READ   CHAR(1)  BINARY NOT NULL,
@@ -28,7 +28,7 @@
 CREATE TABLE SESSION
 ( NUMBER    CHAR(12)   BINARY NOT NULL,
 SERVER_ID INT UNSIGNED NOT NULL,
-DATA      BINARY(2000) NOT NULL,
+DATA      VARBINARY(1998) NOT NULL,
 PRIMARY KEY USING HASH (NUMBER,SERVER_ID))
 ENGINE = NDB;
 CREATE TABLE SERVER

--- 1.1/mysql-test/t/rpl_ndb_sync.test	2005-07-21 20:35:20 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_sync.test	2005-10-27 23:37:58 +02:00
@@ -27,7 +27,9 @@
 # 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 -D , SYSTAB_0 | grep 520093696 >
var/tmp.dat
+--disable_warnings
 CREATE TABLE IF NOT EXISTS cluster_replication.backup_info (id INT, backup_id INT);
+--enable_warnings
 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>