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

[Pekka Nousiainen]

 4400 Pekka Nousiainen	2011-06-15
      wl#4124 x08_fix.diff
      build fixes

    modified:
      libmysqld/Makefile.am
      sql/ha_ndb_index_stat.cc
 4399 Pekka Nousiainen	2011-06-15
      wl#4124 b06_handler.diff
      handler (+ start on modularize), simple MTR fixes

    added:
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
    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/Makefile.am
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
      storage/ndb/CMakeLists.txt
=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2010-02-12 14:48:30 +0000
+++ b/libmysqld/Makefile.am	2011-06-15 12:51:00 +0000
@@ -49,6 +49,7 @@ noinst_HEADERS =	embedded_priv.h emb_qca
 sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
 	     ha_ndbcluster.cc ha_ndbcluster_cond.cc \
 	ha_ndbcluster_connection.cc ha_ndbinfo.cc \
+	ha_ndb_index_stat.cc \
 	ha_ndbcluster_binlog.cc ha_partition.cc \
 	handler.cc sql_handler.cc \
 	hostname.cc init.cc password.c \
@@ -121,6 +122,9 @@ ha_ndbcluster_binlog.o: ha_ndbcluster_bi
 ha_ndbcluster_connection.o: ha_ndbcluster_connection.cc
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 
+ha_ndb_index_stat.o: ha_ndb_index_stat.cc
+		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
+
 ha_ndbinfo.o: ha_ndbinfo.cc
 		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
 

=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-06-15 10:37:56 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-06-15 12:51:00 +0000
@@ -1811,7 +1811,7 @@ ha_ndbcluster::ndb_index_stat_query(uint
   DBUG_PRINT("index_stat", ("index: %s", index->getName()));
 
   THD *thd= current_thd;
-  Ndb *ndb= get_ndb(thd);
+  Ndb *ndb= get_thd_ndb(thd)->ndb;
   int err= 0;
 
   /* Create an IndexBound struct for the keys */

No bundle (reason: useless for push emails).