bzr push into mysql-5.1-telco-7.0-wl4124 branch (pekka.nousiainen:4386 to 4387) WL#4124

[Pekka Nousiainen]

 4387 Pekka Nousiainen	2011-05-29
      wl#4124 x05_fix.diff
      CXX=gcc and __cxa_guard_acquire

    modified:
      storage/ndb/tools/ndb_index_stat.cpp
 4386 Pekka Nousiainen	2011-05-29
      wl#4124 b06_handler.diff
      handler, simple MTR fixes

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_index_ordered.result
      mysql-test/suite/ndb/t/ndb_basic.test
      mysql-test/suite/ndb/t/ndb_index_ordered.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
=== modified file 'storage/ndb/tools/ndb_index_stat.cpp'
--- a/storage/ndb/tools/ndb_index_stat.cpp	2011-05-29 13:00:16 +0000
+++ b/storage/ndb/tools/ndb_index_stat.cpp	2011-05-29 16:01:46 +0000
@@ -48,10 +48,10 @@ static const NdbDictionary::Index* g_ind
     break; \
   }
 
-static const NdbError&
+static NdbError
 getNdbError(Ndb_cluster_connection* ncc)
 {
-  static NdbError err;
+  NdbError err;
   err.code = g_ncc->get_latest_error();
   err.message = g_ncc->get_latest_error_msg();
   return err;

No bundle (reason: useless for push emails).