bk commit into 5.1 tree (mronstrom:1.1885)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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.1885 05/07/16 18:34:48 mronstrom@stripped +3 -0
  Various fixes

  mysql-test/t/ndb_partition_key.test
    1.2 05/07/16 18:34:38 mronstrom@stripped +1 -1
    New error codes

  mysql-test/r/ndb_partition_range.result
    1.2 05/07/16 18:34:38 mronstrom@stripped +3 -0
    Bug in test program revealed when fixing bug in program

  mysql-test/r/ndb_partition_key.result
    1.2 05/07/16 18:34:38 mronstrom@stripped +2 -2
    New fragment types in test case and frm file size changed

# 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:	mronstrom
# Host:	c-320be253.1238-1-64736c10.cust.bredbandsbolaget.se
# Root:	/Users/mikron/wl1354

--- 1.1/mysql-test/r/ndb_partition_key.result	2005-07-11 18:21:34 +02:00
+++ 1.2/mysql-test/r/ndb_partition_key.result	2005-07-16 18:34:38 +02:00
@@ -47,14 +47,14 @@
 insert into t1 values (1,"a",1,1),(2,"a",1,1),(3,"a",1,1);
 -- t1 --
 
-Fragment type: 2
+Fragment type: 5
 K Value: 6
 Min load factor: 78
 Max load factor: 80
 Temporary table: no
 Number of attributes: 4
 Number of primary keys: 3
-Length of frm data: 295
+Length of frm data: 301
 TableStatus: Retrieved
 -- Attributes -- 
 a Int PRIMARY KEY

--- 1.1/mysql-test/r/ndb_partition_range.result	2005-07-11 18:21:28 +02:00
+++ 1.2/mysql-test/r/ndb_partition_range.result	2005-07-16 18:34:38 +02:00
@@ -33,6 +33,9 @@
 a	b	c
 select * from t1 where a in (1,6,10,21) order by a;
 a	b	c
+1	1	1
+6	1	1
+10	1	1
 select * from t1 where b=1 and a in (1,6,10,21) order by a;
 a	b	c
 1	1	1

--- 1.1/mysql-test/t/ndb_partition_key.test	2005-07-11 18:20:14 +02:00
+++ 1.2/mysql-test/t/ndb_partition_key.test	2005-07-16 18:34:38 +02:00
@@ -23,7 +23,7 @@
 drop table t1;
 
 # only support for partition key on primary key
---error 1449
+--error 1452
 CREATE TABLE t1 (a int, b int, c int, d int, PRIMARY KEY(a,b))
   ENGINE = NDB
   PARTITION BY KEY (c);