bk commit into 5.1 tree (jimw:1.2134)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw 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.2134 06/02/17 14:41:57 jimw@stripped +7 -0
  Fix results due to change in SHOW CREATE TABLE output

  mysql-test/r/rpl_ndb_UUID.result
    1.2 06/02/17 14:41:54 jimw@stripped +1 -1
    Update result

  mysql-test/r/ndb_temporary.result
    1.2 06/02/17 14:41:53 jimw@stripped +1 -1
    Update result

  mysql-test/r/ndb_partition_range.result
    1.6 06/02/17 14:41:53 jimw@stripped +1 -1
    Update result

  mysql-test/r/ndb_partition_key.result
    1.9 06/02/17 14:41:53 jimw@stripped +1 -1
    Update result

  mysql-test/r/ndb_dd_disk2memory.result
    1.4 06/02/17 14:41:53 jimw@stripped +4 -4
    Update result

  mysql-test/r/ndb_dd_basic.result
    1.6 06/02/17 14:41:53 jimw@stripped +1 -1
    Update result

  mysql-test/r/ndb_bitfield.result
    1.10 06/02/17 14:41:53 jimw@stripped +1 -1
    Update result

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.1-clean

--- 1.3/mysql-test/r/ndb_dd_disk2memory.result	2006-02-01 03:12:40 -08:00
+++ 1.4/mysql-test/r/ndb_dd_disk2memory.result	2006-02-17 14:41:53 -08:00
@@ -217,7 +217,7 @@
   `pk2` int(11) NOT NULL,
   `b2` int(11) NOT NULL,
   `c2` int(11) NOT NULL,
-  PRIMARY KEY  (`pk2`)
+  PRIMARY KEY (`pk2`)
 ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 SHOW CREATE TABLE test.t1;
 Table	Create Table
@@ -225,7 +225,7 @@
   `pk1` int(11) NOT NULL,
   `b` int(11) NOT NULL,
   `c` int(11) NOT NULL,
-  PRIMARY KEY  (`pk1`)
+  PRIMARY KEY (`pk1`)
 ) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK
 ENGINE=NDB;
@@ -235,7 +235,7 @@
   `pk2` int(11) NOT NULL,
   `b2` int(11) NOT NULL,
   `c2` int(11) NOT NULL,
-  PRIMARY KEY  (`pk2`)
+  PRIMARY KEY (`pk2`)
 ) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 ALTER TABLE test.t1 ENGINE=NDBCLUSTER;
 SHOW CREATE TABLE test.t1;
@@ -244,7 +244,7 @@
   `pk1` int(11) NOT NULL,
   `b` int(11) NOT NULL,
   `c` int(11) NOT NULL,
-  PRIMARY KEY  (`pk1`)
+  PRIMARY KEY (`pk1`)
 ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 
 DROP TABLE test.t1;

--- 1.1/mysql-test/r/rpl_ndb_UUID.result	2006-02-15 12:44:41 -08:00
+++ 1.2/mysql-test/r/rpl_ndb_UUID.result	2006-02-17 14:41:54 -08:00
@@ -32,7 +32,7 @@
   `a` int(11) NOT NULL default '0',
   `blob_column` longblob,
   `vchar_column` varchar(100) default NULL,
-  PRIMARY KEY  (`a`)
+  PRIMARY KEY (`a`)
 ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 DROP PROCEDURE test.p1;
 DROP FUNCTION test.fn1;

--- 1.5/mysql-test/r/ndb_dd_basic.result	2006-02-01 02:56:12 -08:00
+++ 1.6/mysql-test/r/ndb_dd_basic.result	2006-02-17 14:41:53 -08:00
@@ -27,7 +27,7 @@
   `pk1` int(11) NOT NULL,
   `b` int(11) NOT NULL,
   `c` int(11) NOT NULL,
-  PRIMARY KEY  (`pk1`)
+  PRIMARY KEY (`pk1`)
 ) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 INSERT INTO t1 VALUES (0, 0, 0);
 SELECT * FROM t1;

--- 1.8/mysql-test/r/ndb_partition_key.result	2006-01-16 23:37:19 -08:00
+++ 1.9/mysql-test/r/ndb_partition_key.result	2006-02-17 14:41:53 -08:00
@@ -77,7 +77,7 @@
   `b` char(10) character set latin1 collate latin1_bin NOT NULL default '',
   `c` int(11) NOT NULL default '0',
   `d` int(11) default NULL,
-  PRIMARY KEY  USING HASH (`a`,`b`,`c`)
+  PRIMARY KEY USING HASH (`a`,`b`,`c`)
 ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (b) 
 DROP TABLE t1;
 CREATE TABLE t1 (a int not null primary key)

--- 1.5/mysql-test/r/ndb_partition_range.result	2006-01-10 07:42:19 -08:00
+++ 1.6/mysql-test/r/ndb_partition_range.result	2006-02-17 14:41:53 -08:00
@@ -113,7 +113,7 @@
   `a` int(11) NOT NULL,
   `b` int(11) NOT NULL,
   `c` int(11) NOT NULL,
-  PRIMARY KEY  (`b`),
+  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)
 drop table t1;

--- 1.9/mysql-test/r/ndb_bitfield.result	2006-01-16 23:37:19 -08:00
+++ 1.10/mysql-test/r/ndb_bitfield.result	2006-02-17 14:41:53 -08:00
@@ -8,7 +8,7 @@
 t1	CREATE TABLE `t1` (
   `pk1` int(11) NOT NULL,
   `b` bit(64) default NULL,
-  PRIMARY KEY  (`pk1`)
+  PRIMARY KEY (`pk1`)
 ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 insert into t1 values 
 (0,b'1111111111111111111111111111111111111111111111111111111111111111'),

--- 1.1/mysql-test/r/ndb_temporary.result	2006-02-17 08:12:19 -08:00
+++ 1.2/mysql-test/r/ndb_temporary.result	2006-02-17 14:41:53 -08:00
@@ -16,6 +16,6 @@
 Table	Create Table
 t1	CREATE TEMPORARY TABLE `t1` (
   `a` int(11) NOT NULL,
-  PRIMARY KEY  (`a`)
+  PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;