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

[Pekka Nousiainen]

 4417 Pekka Nousiainen	2011-07-23
      wl#4124 x14_fix.diff
      compile errors

    modified:
      sql/ha_ndb_index_stat.cc
 4416 Pekka Nousiainen	2011-07-23
      wl#4124 e04_error.diff
      allow "no stats" (error 4715)

    modified:
      mysql-test/suite/ndb/r/ndb_index_stat.result
      mysql-test/suite/ndb/r/ndb_statistics1.result
      sql/ha_ndb_index_stat.cc
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-07-23 14:38:08 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-07-23 17:22:32 +0000
@@ -612,7 +612,6 @@ Ndb_index_stat_list ndb_index_stat_list[
 void
 ndb_index_stat_list_add(Ndb_index_stat* st, int lt)
 {
-  Ndb_index_stat_glob &glob= ndb_index_stat_glob;
   assert(st != 0 && st->lt == 0);
   assert(st->list_next == 0 && st->list_prev == 0);
   assert(1 <= lt && lt < Ndb_index_stat::LT_Count);
@@ -641,7 +640,6 @@ ndb_index_stat_list_add(Ndb_index_stat*
 void
 ndb_index_stat_list_remove(Ndb_index_stat* st)
 {
-  Ndb_index_stat_glob &glob= ndb_index_stat_glob;
   assert(st != 0);
   int lt= st->lt;
   assert(1 <= lt && lt < Ndb_index_stat::LT_Count);
@@ -777,7 +775,7 @@ ndb_index_stat_find_share(NDB_SHARE *sha
 }
 
 /* Subroutine, have lock */
-Ndb_index_stat*
+void
 ndb_index_stat_add_share(NDB_SHARE *share,
                          Ndb_index_stat *st,
                          Ndb_index_stat *st_last)

No bundle (reason: useless for push emails).