bk commit into 5.1 tree (tomas:1.1960)

[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.1960 05/06/10 01:52:33 tomas@stripped +2 -0
  ndb_partition_key.test, ndb_partition_key.result:
    added test for char partition key

  mysql-test/t/ndb_partition_key.test
    1.5 05/06/10 01:52:14 tomas@stripped +17 -0
    added test for char partition key

  mysql-test/r/ndb_partition_key.result
    1.4 05/06/10 01:52:00 tomas@stripped +30 -0
    added test for char partition key

# 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/wl2325-wl1354-new

--- 1.3/mysql-test/r/ndb_partition_key.result	2005-05-27 01:44:04 +02:00
+++ 1.4/mysql-test/r/ndb_partition_key.result	2005-06-10 01:52:00 +02:00
@@ -39,3 +39,33 @@
 1	11	3
 1	12	3
 DROP TABLE t1;
+CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,
+PRIMARY KEY USING HASH (a,b,c))
+ENGINE=NDB
+DEFAULT CHARSET=latin1
+PARTITION BY KEY (b);
+insert into t1 values (1,"a",1,1),(2,"a",1,1),(3,"a",1,1);
+-- t1 --
+
+Fragment type: 2
+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
+TableStatus: Retrieved
+-- Attributes -- 
+a Int PRIMARY KEY
+b Char(10;latin1_bin) PRIMARY KEY DISTRIBUTION KEY
+c Int PRIMARY KEY
+d Int NULL
+
+-- Indexes -- 
+PRIMARY KEY(a, b, c) - UniqueHashIndex
+
+
+NDBT_ProgramExit: 0 - OK
+
+DROP TABLE t1;

--- 1.4/mysql-test/t/ndb_partition_key.test	2005-06-07 22:32:53 +02:00
+++ 1.5/mysql-test/t/ndb_partition_key.test	2005-06-10 01:52:14 +02:00
@@ -39,3 +39,20 @@
 select * from t1 order by b;
 
 DROP TABLE t1;
+
+#
+# Test partition and char support
+#
+
+CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,
+                 PRIMARY KEY USING HASH (a,b,c))
+                 ENGINE=NDB
+                 DEFAULT CHARSET=latin1
+                 PARTITION BY KEY (b);
+
+insert into t1 values (1,"a",1,1),(2,"a",1,1),(3,"a",1,1);
+
+# should show only one attribute with DISTRIBUTION KEY
+--exec $NDB_TOOLS_DIR/ndb_desc --no-defaults -d test t1 | sed 's/Version: [0-9]*//'
+
+DROP TABLE t1;