bzr push into mysql-5.5-cluster branch (jonas.oreland:3414 to 3415)

[jonas oreland]

 3415 jonas oreland	2011-07-01
      ndb - compiler warning: unused value

    modified:
      sql/ha_ndbcluster.cc
 3414 jonas oreland	2011-07-01 [merge]
      ndb merge 71 to 55

    added:
      mysql-test/suite/ndb/bug12712109.ini
    modified:
      mysql-test/suite/ndb/r/ndb_config.result
      mysql-test/suite/ndb/t/ndb_config.test
      sql/ha_ndb_index_stat.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-07-01 10:35:04 +0000
+++ b/sql/ha_ndbcluster.cc	2011-07-01 11:53:46 +0000
@@ -13322,7 +13322,7 @@ void ha_ndbcluster::check_read_before_wr
   /* Index must be unique */
   DBUG_PRINT("info", ("using index %d", active_index));
   const KEY *key= table->key_info + active_index;
-  assert((key->flags & HA_NOSAME));
+  assert((key->flags & HA_NOSAME)); NDB_IGNORE_VALUE(key);
 
   DBUG_VOID_RETURN;
 }

No bundle (reason: useless for push emails).