bk commit into 5.1 tree (ngrishakin:1.2391)

[Nikolay Grishakin]

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.2391 06/05/13 01:32:24 ngrishakin@stripped +2 -0
  Merge ngrishakin@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new

  BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d
    1.14 06/05/13 01:32:19 ngrishakin@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840
    1.20 06/05/13 01:32:19 ngrishakin@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d
    1.13 06/05/13 01:32:19 ngrishakin@stripped +0 -0
    Merge rename: mysql-test/t/ndb_partition_key.test -> BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d

  BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840
    1.19 06/05/13 01:32:19 ngrishakin@stripped +0 -0
    Merge rename: mysql-test/r/ndb_partition_key.result -> BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840

# 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:	ngrishakin
# Host:	ndb15.mysql.com
# Root:	/home/ndbdev/ngrishakin/mysql-5.1-new/RESYNC

--- 1.12/mysql-test/t/ndb_partition_key.test	2006-05-12 21:44:11 +02:00
+++ 1.14/BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d	2006-05-13 01:32:19 +02:00
@@ -22,15 +22,8 @@
 
 drop table t1;
 
-# only support for partition key on primary key
---error ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
 CREATE TABLE t1 (a int, b int, c int, d int, PRIMARY KEY(a,b))
-  ENGINE = NDB
-  PARTITION BY KEY (c);
-
-CREATE TABLE t1 (a int, b int, c int, PRIMARY KEY(a,b))
-  ENGINE = NDB
-  PARTITION BY KEY (a);
+  ENGINE = NDB;
 
 insert into t1 values 
        (1,1,3),(1,2,3),(1,3,3),(1,4,3),(1,5,3),(1,6,3),
@@ -108,7 +101,7 @@
 partition by key (a)
 (partition p0 engine=ndb, partition p1 engine=ndb);
 show create table t1;
-
+t/bin/bash: q: command not found
 alter table t1 remove partitioning;
 show create table t1;