List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:October 4 2012 7:23pm
Subject:bzr push into mysql-trunk-cluster branch (magnus.blaudd:3539 to 3540)
View as plain text  
 3540 magnus.blaudd@stripped	2012-10-04 [merge]
      Merge 7.3 -> trunk-cluster

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_bitfield.result
      mysql-test/suite/ndb/r/ndb_partition_error.result
      mysql-test/suite/ndb/t/ndb_basic.test
      mysql-test/suite/ndb/t/ndb_bitfield.test
      mysql-test/suite/ndb/t/ndb_partition_error.test
      sql/handler.cc
 3539 magnus.blaudd@stripped	2012-10-04
      ndbcluster
       - Disable follow up patch for Bug#13840553 by marking it with MCP
         tags until also 5.6 based cluster has got this patch and the .result
         files can be changed there

    modified:
      sql/handler.cc
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2012-09-27 13:03:40 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2012-10-04 18:08:55 +0000
@@ -993,11 +993,11 @@ id	parent_id
 DROP TABLE child, parent;
 CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT)
 ENGINE=ndb PARTITION BY KEY(a) PARTITIONS 144;
-ERROR HY000: Got error 140 'Unknown error code' from NDBCLUSTER
+ERROR HY000: Table storage engine for 't1' doesn't have this option
 show warnings;
 Level	Code	Message
 Warning	1296	Got error 1224 'Too many fragments' from NDB
-Error	1296	Got error 140 'Unknown error code' from NDBCLUSTER
+Error	1031	Table storage engine for 't1' doesn't have this option
 CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT)
 ENGINE=ndb;
 show warnings;

=== modified file 'mysql-test/suite/ndb/r/ndb_bitfield.result'
--- a/mysql-test/suite/ndb/r/ndb_bitfield.result	2012-09-27 13:03:40 +0000
+++ b/mysql-test/suite/ndb/r/ndb_bitfield.result	2012-10-04 18:08:55 +0000
@@ -245,8 +245,8 @@ b bit(32) not null
 insert into t1 values (1,1);
 drop table t1;
 create table bigbits ( k int unsigned primary key, c1 bit(64), c2 bit(64), c3 bit(64), c4 bit(64), c5 bit(64), c6 bit(64), c7 bit(64), c8 bit(64), c9 bit(64), c10 bit(64), c11 bit(64), c12 bit(64), c13 bit(64), c14 bit(64), c15 bit(64), c16 bit(64), c17 bit(64), c18 bit(64), c19 bit(64), c20 bit(64), c21 bit(64), c22 bit(64), c23 bit(64), c24 bit(64), c25 bit(64), c26 bit(64), c27 bit(64), c28 bit(64), c29 bit(64), c30 bit(64), c31 bit(64), c32 bit(64), c33 bit(64), c34 bit(64), c35 bit(64), c36 bit(64), c37 bit(64), c38 bit(64), c39 bit(64), c40 bit(64), c41 bit(64), c42 bit(64), c43 bit(64), c44 bit(64), c45 bit(64), c46 bit(64), c47 bit(64), c48 bit(64), c49 bit(64), c50 bit(64), c51 bit(64), c52 bit(64), c53 bit(64), c54 bit(64), c55 bit(64), c56 bit(64), c57 bit(64), c58 bit(64), c59 bit(64), c60 bit(64), c61 bit(64), c62 bit(64), c63 bit(64), c64 bit(64), c65 bit(64), c66 bit(64), c67 bit(64), c68 bit(64), c69 bit(64), c70 bit(64), c71 bit(64), c72 bit(64), c73 bit(64!
 ), c74 bit(64), c75 bit(64), c76 bit(64), c77 bit(64), c78 bit(64), c79 bit(64), c80 bit(64), c81 bit(64), c82 bit(64), c83 bit(64), c84 bit(64), c85 bit(64), c86 bit(64), c87 bit(64), c88 bit(64), c89 bit(64), c90 bit(64), c91 bit(64), c92 bit(64), c93 bit(64), c94 bit(64), c95 bit(64), c96 bit(64), c97 bit(64), c98 bit(64), c99 bit(64), c100 bit(64), c101 bit(64), c102 bit(64), c103 bit(64), c104 bit(64), c105 bit(64), c106 bit(64), c107 bit(64), c108 bit(64), c109 bit(64), c110 bit(64), c111 bit(64), c112 bit(64), c113 bit(64), c114 bit(64), c115 bit(64), c116 bit(64), c117 bit(64), c118 bit(64), c119 bit(64), c120 bit(64), c121 bit(64), c122 bit(64), c123 bit(64), c124 bit(64), c125 bit(64), c126 bit(64)) engine=ndb;
-ERROR HY000: Got error 140 'Unknown error code' from NDBCLUSTER
+ERROR HY000: Table storage engine for 'bigbits' doesn't have this option
 show warnings;
 Level	Code	Message
 Warning	1296	Got error 791 'Too many total bits in bitfields' from NDB
-Error	1296	Got error 140 'Unknown error code' from NDBCLUSTER
+Error	1031	Table storage engine for 'bigbits' doesn't have this option

=== modified file 'mysql-test/suite/ndb/r/ndb_partition_error.result'
--- a/mysql-test/suite/ndb/r/ndb_partition_error.result	2012-09-27 13:03:40 +0000
+++ b/mysql-test/suite/ndb/r/ndb_partition_error.result	2012-10-04 18:08:55 +0000
@@ -11,11 +11,11 @@ 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: Got error 771 'Given NODEGROUP doesn't exist in this cluster' from NDBCLUSTER
+ERROR HY000: Table storage engine for 't1' doesn't have this option
 show warnings;
 Level	Code	Message
 Warning	1296	Got error 771 'Given NODEGROUP doesn't exist in this cluster' from NDB
-Error	1296	Got error 771 'Given NODEGROUP doesn't exist in this cluster' from NDBCLUSTER
+Error	1031	Table storage engine for 't1' doesn't have this option
 CREATE TABLE t1 (
 a int not null,
 b int not null,

=== modified file 'mysql-test/suite/ndb/t/ndb_basic.test'
--- a/mysql-test/suite/ndb/t/ndb_basic.test	2012-09-27 13:03:40 +0000
+++ b/mysql-test/suite/ndb/t/ndb_basic.test	2012-10-04 18:08:55 +0000
@@ -828,7 +828,7 @@ DROP TABLE child, parent;
 #
 # bug#59756
 #
---error 1296
+--error 1031
 CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT)
 ENGINE=ndb PARTITION BY KEY(a) PARTITIONS 144;
 show warnings;

=== modified file 'mysql-test/suite/ndb/t/ndb_bitfield.test'
--- a/mysql-test/suite/ndb/t/ndb_bitfield.test	2012-09-27 13:03:40 +0000
+++ b/mysql-test/suite/ndb/t/ndb_bitfield.test	2012-10-04 18:08:55 +0000
@@ -140,6 +140,6 @@ drop table t1;
 
 # Bug#42046   MySQL Cluster : Too many BIT columns causes cluster failure
 
---error 1296
+--error 1031 
 create table bigbits ( k int unsigned primary key, c1 bit(64), c2 bit(64), c3 bit(64), c4 bit(64), c5 bit(64), c6 bit(64), c7 bit(64), c8 bit(64), c9 bit(64), c10 bit(64), c11 bit(64), c12 bit(64), c13 bit(64), c14 bit(64), c15 bit(64), c16 bit(64), c17 bit(64), c18 bit(64), c19 bit(64), c20 bit(64), c21 bit(64), c22 bit(64), c23 bit(64), c24 bit(64), c25 bit(64), c26 bit(64), c27 bit(64), c28 bit(64), c29 bit(64), c30 bit(64), c31 bit(64), c32 bit(64), c33 bit(64), c34 bit(64), c35 bit(64), c36 bit(64), c37 bit(64), c38 bit(64), c39 bit(64), c40 bit(64), c41 bit(64), c42 bit(64), c43 bit(64), c44 bit(64), c45 bit(64), c46 bit(64), c47 bit(64), c48 bit(64), c49 bit(64), c50 bit(64), c51 bit(64), c52 bit(64), c53 bit(64), c54 bit(64), c55 bit(64), c56 bit(64), c57 bit(64), c58 bit(64), c59 bit(64), c60 bit(64), c61 bit(64), c62 bit(64), c63 bit(64), c64 bit(64), c65 bit(64), c66 bit(64), c67 bit(64), c68 bit(64), c69 bit(64), c70 bit(64), c71 bit(64), c72 bit(64), c73 bit(64!
 ), c74 bit(64), c75 bit(64), c76 bit(64), c77 bit(64), c78 bit(64), c79 bit(64), c80 bit(64), c81 bit(64), c82 bit(64), c83 bit(64), c84 bit(64), c85 bit(64), c86 bit(64), c87 bit(64), c88 bit(64), c89 bit(64), c90 bit(64), c91 bit(64), c92 bit(64), c93 bit(64), c94 bit(64), c95 bit(64), c96 bit(64), c97 bit(64), c98 bit(64), c99 bit(64), c100 bit(64), c101 bit(64), c102 bit(64), c103 bit(64), c104 bit(64), c105 bit(64), c106 bit(64), c107 bit(64), c108 bit(64), c109 bit(64), c110 bit(64), c111 bit(64), c112 bit(64), c113 bit(64), c114 bit(64), c115 bit(64), c116 bit(64), c117 bit(64), c118 bit(64), c119 bit(64), c120 bit(64), c121 bit(64), c122 bit(64), c123 bit(64), c124 bit(64), c125 bit(64), c126 bit(64)) engine=ndb;
 show warnings;

=== modified file 'mysql-test/suite/ndb/t/ndb_partition_error.test'
--- a/mysql-test/suite/ndb/t/ndb_partition_error.test	2012-09-27 13:03:40 +0000
+++ b/mysql-test/suite/ndb/t/ndb_partition_error.test	2012-10-04 18:08:55 +0000
@@ -16,7 +16,7 @@ set new=on;
 #
 # Partition by range, generate node group error
 #
---error 1296 
+--error 1031 
 CREATE TABLE t1 (
 a int not null,
 b int not null,

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2012-10-04 12:53:07 +0000
+++ b/sql/handler.cc	2012-10-04 19:03:53 +0000
@@ -3648,13 +3648,9 @@ void handler::print_error(int error, myf
   case HA_ERR_TABLE_IN_FK_CHECK:
     textno= ER_TABLE_IN_FK_CHECK;
     break;
-#ifdef MCP_BUG13840553
-    // Wait for 5.6 to also get this fix to avoid changing .result files back
-    // and forth
   case HA_WRONG_CREATE_OPTION:
     textno= ER_ILLEGAL_HA;
     break;
-#endif
   default:
     {
       /* The error was "unknown" to this function.

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (magnus.blaudd:3539 to 3540) magnus.blaudd5 Oct