bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4457 to 4458)

[Martin Zaun]

 4458 Martin Zaun	2012-02-06 [merge]
      merge from ndb-7.1-include-fix to ndb-7.1

    modified:
      storage/ndb/test/ndbapi/testNdbApi.cpp
 4457 jonas oreland	2012-02-03 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/include/ndb_version.h.in
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/ndbd.cpp
=== modified file 'storage/ndb/test/ndbapi/testNdbApi.cpp'
--- a/storage/ndb/test/ndbapi/testNdbApi.cpp	2011-10-14 13:24:26 +0000
+++ b/storage/ndb/test/ndbapi/testNdbApi.cpp	2012-02-07 02:53:27 +0000
@@ -25,7 +25,7 @@
 #include <random.h>
 #include <NdbTick.h>
 #include <my_sys.h>
-#include <SignalSender.hpp>
+#include "../../src/ndbapi/SignalSender.hpp"
 #include <GlobalSignalNumbers.h>
 
 #define MAX_NDB_OBJECTS 32678

No bundle (reason: useless for push emails).