bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4965 to 4966)

[magnus.blaudd]

 4966 magnus.blaudd@stripped	2012-09-12 [merge]
      Merge

    modified:
      storage/ndb/include/util/NdbOut.hpp
      storage/ndb/src/mgmapi/LocalConfig.cpp
      storage/ndb/src/mgmapi/LocalConfig.hpp
      storage/ndb/test/include/NDBT_Stats.hpp
      storage/ndb/test/ndbapi/testRedo.cpp
 4965 Maitrayi Sabaratnam	2012-09-05
      Bug 14582294 - SPJ: GETNODES DOES NOT RETURN CORRCT ERROR CODE

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/include/util/NdbOut.hpp'
--- a/storage/ndb/include/util/NdbOut.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/include/util/NdbOut.hpp	2012-09-06 11:32:26 +0000
@@ -93,11 +93,6 @@ private:
   bool m_autoflush;
 };
 
-#ifdef NDB_WIN
-typedef int(*NdbOutF)(char*);
-extern NdbOutF ndbout_svc;
-#endif
-
 inline NdbOut& NdbOut::operator<<(NdbOut& (* _f)(NdbOut&)) {
   (* _f)(*this); 
   return * this; 

=== modified file 'storage/ndb/src/mgmapi/LocalConfig.cpp'
--- a/storage/ndb/src/mgmapi/LocalConfig.cpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/mgmapi/LocalConfig.cpp	2012-09-12 08:41:46 +0000
@@ -117,31 +117,6 @@ void LocalConfig::setError(int lineNumbe
   strncpy(error_msg, _msg, sizeof(error_msg));
 }
 
-void LocalConfig::printError() const {
-  ndbout << "Configuration error" << endl;
-  if (error_line)
-    ndbout << "Line: "<< error_line << ", ";
-  ndbout << error_msg << endl << endl;
-}
-
-void LocalConfig::printUsage() const {
-  ndbout << "This node needs information on how to connect"<<endl
-	 << "to the NDB Management Server."<<endl
-	 << "The information can be supplied in one of the following ways:"
-	 << endl;
-    
-  ndbout << "1. Put a Ndb.cfg file in the directory where you start"<<endl 
-	 << "   the node. "<< endl
-	 << "   Ex: Ndb.cfg" << endl
-	 << "   | host=localhost:"<<NDB_PORT<<endl;
-    
-  ndbout << "2. Use the environment variable NDB_CONNECTSTRING to "<<endl
-	 << "   provide this information." <<endl
-	 << "   Ex: " << endl
-	 << "   >export NDB_CONNECTSTRING=\"host=localhost:"<<NDB_PORT<<"\""
-	 <<endl<<endl;
-}
-  
 const char *nodeIdTokens[] = {
   "OwnProcessId %i",
   "nodeid=%i",

=== modified file 'storage/ndb/src/mgmapi/LocalConfig.hpp'
--- a/storage/ndb/src/mgmapi/LocalConfig.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/mgmapi/LocalConfig.hpp	2012-09-12 08:41:46 +0000
@@ -55,9 +55,6 @@ struct LocalConfig {
   bool init(const char *connectString = 0,
 	    const char *fileName = 0);
 
-  void printError() const;
-  void printUsage() const;
-
   void setError(int lineNumber, const char * _msg);
   bool readConnectString(const char *, const char *info);
   bool readFile(const char * file, bool &fopenError);

=== modified file 'storage/ndb/test/include/NDBT_Stats.hpp'
--- a/storage/ndb/test/include/NDBT_Stats.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/include/NDBT_Stats.hpp	2012-09-06 07:24:56 +0000
@@ -59,20 +59,4 @@ private:
   double min, max;
 };
 
-inline
-double
-NDB_SQRT(double x){
-  assert(x >= 0);
-
-  double y = 0;
-  double s = 1;
-  double r = 0;
-  while(y <= x){
-    y += s;
-    s += 2;
-    r += 1;
-  }
-  return r - 1;
-}
-
 #endif

=== modified file 'storage/ndb/test/ndbapi/testRedo.cpp'
--- a/storage/ndb/test/ndbapi/testRedo.cpp	2012-08-13 13:03:29 +0000
+++ b/storage/ndb/test/ndbapi/testRedo.cpp	2012-09-12 09:12:03 +0000
@@ -25,8 +25,6 @@
 #include <NDBT_Stats.hpp>
 #include <random.h>
 
-#include "storage/ndb/src/mgmapi/mgmapi_configuration.hpp"
-
 static NdbMutex* g_msgmutex = 0;
 
 #undef require

No bundle (reason: useless for push emails).