bzr push into mysql-5.1-telco-6.3 branch (jonas:3382 to 3383)

[Jonas Oreland]

 3383 Jonas Oreland	2011-01-27
      ndb - bug-59756 - recommit testcase for 6.3...but no fix needed

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/t/ndb_basic.test
 3382 Jonas Oreland	2011-01-27
      ndb - remove very very old work-around (bug-16445) that should not be needed anymore

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/t/ndb_basic.test
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2011-01-27 10:22:11 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2011-01-27 13:30:22 +0000
@@ -988,4 +988,16 @@ id	parent_id
 2	2
 3	3
 DROP TABLE child, parent;
+CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT)
+ENGINE=ndb PARTITION BY KEY(a) PARTITIONS 24;
+ERROR HY000: Can't create table 'test.t1' (errno: 140)
+show warnings;
+Level	Code	Message
+Error	1296	Got error 1224 'Too many fragments' from NDB
+Error	1005	Can't create table 'test.t1' (errno: 140)
+CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT)
+ENGINE=ndb;
+show warnings;
+Level	Code	Message
+drop table t1;
 End of 5.1 tests

=== modified file 'mysql-test/suite/ndb/t/ndb_basic.test'
--- a/mysql-test/suite/ndb/t/ndb_basic.test	2011-01-27 10:22:11 +0000
+++ b/mysql-test/suite/ndb/t/ndb_basic.test	2011-01-27 13:30:22 +0000
@@ -898,4 +898,16 @@ SELECT * FROM child ORDER BY id;
 
 DROP TABLE child, parent;
 
+#
+# bug#59756
+#
+--error 1005
+CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT)
+ENGINE=ndb PARTITION BY KEY(a) PARTITIONS 24;
+show warnings;
+CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT)
+ENGINE=ndb;
+show warnings;
+drop table t1;
+
 --echo End of 5.1 tests

No bundle (reason: useless for push emails).