bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4070 to 4071)

[magnus.blaudd]

 4071 magnus.blaudd@stripped	2012-11-06 [merge]
      Merge 7.1 -> 7.2

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_index.result
      mysql-test/suite/ndb/t/ndb_index.test
      sql/ha_ndbcluster.cc
      storage/ndb/src/ndbapi/ndberror.c
 4070 magnus.blaudd@stripped	2012-11-06 [merge]
      Merge 7.1 -> 7.2

    added:
      mysql-test/suite/ndb/t/ndb_cache.cnf
      mysql-test/suite/ndb/t/ndb_cache2.cnf
      mysql-test/suite/ndb/t/ndb_cache_multi.cnf
      mysql-test/suite/ndb/t/ndb_cache_multi2.cnf
      mysql-test/suite/ndb/t/ndb_cache_trans.cnf
      mysql-test/suite/ndb/t/ndbinfo_cache.cnf
    modified:
      mysql-test/suite/ndb/r/ndbinfo_cache.result
      mysql-test/suite/ndb/t/ndbinfo_cache.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2012-06-13 19:32:58 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2012-11-06 10:38:28 +0000
@@ -593,7 +593,7 @@ create table t1 ( c50 char(255), c49 cha
 ERROR HY000: Can't create table 'test.t1' (errno: 851)
 show warnings;
 Level	Code	Message
-Warning	1296	Got error 851 'Maximum 8052 bytes of FIXED columns supported, use varchar or COLUMN_FORMAT DYNMIC instead' from NDB
+Warning	1296	Got error 851 'Maximum 8052 bytes of FIXED columns supported, use varchar or COLUMN_FORMAT DYNAMIC instead' from NDB
 Error	1005	Can't create table 'test.t1' (errno: 851)
 create table `t1` (`a` int, b int, primary key (a,b)) engine=ndb partition by key(`a`,`b`,`a`);
 ERROR HY000: Duplicate partition field name 'a'

=== modified file 'mysql-test/suite/ndb/r/ndb_index.result'
--- a/mysql-test/suite/ndb/r/ndb_index.result	2011-12-09 11:57:48 +0000
+++ b/mysql-test/suite/ndb/r/ndb_index.result	2012-11-06 10:38:28 +0000
@@ -169,7 +169,7 @@ unique (c30), unique (c31), unique (c32)
 unique (c40), unique (c41), unique (c42), unique (c43), unique (c44), unique (c45), unique (c46), unique (c47),
 unique (c50), unique (c51), unique (c52), unique (c53), unique (c54), unique (c55), unique (c56), unique (c57),
 unique (c60), unique (c61), unique (c62), unique (c63), unique (c64), unique (c65), unique (c66), unique (c67),
-unique (c60), unique (c71), unique (c72), unique (c73), unique (c74), unique (c75), unique (c76)) engine = ndb;
+unique (c70), unique (c71), unique (c72), unique (c73), unique (c74), unique (c75), unique (c76)) engine = ndb;
 drop table t1;
 CREATE TABLE t1 (
 a INT NOT NULL AUTO_INCREMENT ,

=== modified file 'mysql-test/suite/ndb/t/ndb_index.test'
--- a/mysql-test/suite/ndb/t/ndb_index.test	2010-12-22 11:19:09 +0000
+++ b/mysql-test/suite/ndb/t/ndb_index.test	2012-11-06 10:23:32 +0000
@@ -147,7 +147,7 @@ unique (c30), unique (c31), unique (c32)
 unique (c40), unique (c41), unique (c42), unique (c43), unique (c44), unique (c45), unique (c46), unique (c47),
 unique (c50), unique (c51), unique (c52), unique (c53), unique (c54), unique (c55), unique (c56), unique (c57),
 unique (c60), unique (c61), unique (c62), unique (c63), unique (c64), unique (c65), unique (c66), unique (c67),
-unique (c60), unique (c71), unique (c72), unique (c73), unique (c74), unique (c75), unique (c76)) engine = ndb;
+unique (c70), unique (c71), unique (c72), unique (c73), unique (c74), unique (c75), unique (c76)) engine = ndb;
 
 drop table t1;
 

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2012-11-01 15:38:48 +0000
+++ b/sql/ha_ndbcluster.cc	2012-11-06 10:38:28 +0000
@@ -331,9 +331,6 @@ ndbcluster_fill_is_table(handlerton *hto
 }
 #endif
 
-
-handlerton *ndbcluster_hton;
-
 static handler *ndbcluster_create_handler(handlerton *hton,
                                           TABLE_SHARE *table,
                                           MEM_ROOT *mem_root)
@@ -7575,11 +7572,11 @@ int ha_ndbcluster::start_statement(THD *
 
   if (table_count == 0)
   {
-    trans_register_ha(thd, FALSE, ndbcluster_hton);
+    trans_register_ha(thd, FALSE, ht);
     if (thd_options(thd) & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
     {
       if (!trans)
-        trans_register_ha(thd, TRUE, ndbcluster_hton);
+        trans_register_ha(thd, TRUE, ht);
       thd_ndb->m_handler= NULL;
     }
     else
@@ -11843,6 +11840,8 @@ static MYSQL_SYSVAR_STR(
 
 extern int ndb_dictionary_is_mysqld;
 
+handlerton* ndbcluster_hton;
+
 static int ndbcluster_init(void *p)
 {
   DBUG_ENTER("ndbcluster_init");
@@ -15194,7 +15193,6 @@ uint32 ha_ndbcluster::calculate_key_hash
   int ret_val;
   Uint64 tmp[(MAX_KEY_SIZE_IN_WORDS*MAX_XFRM_MULTIPLY) >> 1];
   void *buf= (void*)&tmp[0];
-  Ndb *ndb= m_thd_ndb->ndb;
   DBUG_ENTER("ha_ndbcluster::calculate_key_hash_value");
 
   do
@@ -15208,7 +15206,7 @@ uint32 ha_ndbcluster::calculate_key_hash
     key_data[i++].len= len;
   } while (*(++field_array));
   key_data[i].ptr= 0;
-  if ((ret_val= ndb->computeHash(&hash_value, m_table,
+  if ((ret_val= Ndb::computeHash(&hash_value, m_table,
                                  key_data_ptr, buf, sizeof(tmp))))
   {
     DBUG_PRINT("info", ("ret_val = %d", ret_val));

=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2012-10-24 11:26:37 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2012-11-06 10:38:28 +0000
@@ -359,7 +359,7 @@ ErrorBundle ErrorCodes[] = {
   { 831,  DMEC, AE, "Too many nullable/bitfields in table definition" },
   { 850,  DMEC, AE, "Too long or too short default value"},
   { 851,  DMEC, AE, "Maximum 8052 bytes of FIXED columns supported"
-    ", use varchar or COLUMN_FORMAT DYNMIC instead" },
+    ", use varchar or COLUMN_FORMAT DYNAMIC instead" },
   { 876,  DMEC, AE, "876" },
   { 877,  DMEC, AE, "877" },
   { 878,  DMEC, AE, "878" },

No bundle (reason: useless for push emails).