Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1

into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1

mysql-test/r/ndb_partition_error.result

@@ -11,7 +11,7 @@ partitions 3
 (partition x1 values less than (5) nodegroup 12,
 partition x2 values less than (10) nodegroup 13,
 partition x3 values less than (20) nodegroup 14);
-ERROR HY000: Can't create table './test/t1.frm' (errno: 1305)
+ERROR HY000: Can't create table './test/t1.frm' (errno: 1307)
 CREATE TABLE t1 (
 a int not null,
 b int not null,

storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp

@@ -61,11 +61,9 @@ public:
  
   enum ErrorCode {
     OK = 0
-    ,InvalidFragmentationType = 1301
-    ,InvalidNodeId = 1302
-    ,InvalidNodeType = 1303
-    ,InvalidPrimaryTable = 1304
-    ,InvalidNodeGroup = 1305
+    ,InvalidNodeGroup = 1307
+    ,InvalidFragmentationType = 1308
+    ,InvalidPrimaryTable = 1309
   };
  
 private:

storage/ndb/src/ndbapi/ndberror.c

@@ -378,6 +378,10 @@ ErrorBundle ErrorCodes[] = {
   { 1305, IE, "Backup definition not implemented" },
   { 1306, AE, "Backup not supported in diskless mode (change Diskless)" },
 
+  { 1307, AE, "Given NODEGROUP doesn't exist in this cluster" },
+  { 1308, IE, "Given fragmentType doesn't exist" },
+  { 1309, IE, "Primary Table in wrong state" },
+  
   { 1321, IE, "Backup aborted by application" },
   { 1322, IE, "Backup already completed" },
   { 1323, IE, "1323" },