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

[Magnus Blåudd]

 4374 Magnus Blåudd	2011-05-12
      ndb
       - add same define for INADDR_NONE as in include/my_net.h to avoid
        problem compiling NdbTCP.cpp if INADDR_NONE define is removed.
       - this hack should do until code does not use INADDR_NONE anymore

    modified:
      storage/ndb/src/common/portlib/NdbTCP.cpp
 4373 Magnus Blåudd	2011-05-12 [merge]
      Merge

    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test
=== modified file 'storage/ndb/src/common/portlib/NdbTCP.cpp'
--- a/storage/ndb/src/common/portlib/NdbTCP.cpp	2011-05-11 19:12:56 +0000
+++ b/storage/ndb/src/common/portlib/NdbTCP.cpp	2011-05-12 12:53:51 +0000
@@ -19,6 +19,13 @@
 #include <ndb_global.h>
 #include <NdbTCP.h>
 
+
+/* On some operating systems (e.g. Solaris) INADDR_NONE is not defined */
+#ifndef INADDR_NONE
+#define INADDR_NONE -1                          /* Error value from inet_addr */
+#endif
+
+
 extern "C"
 int
 Ndb_getInAddr(struct in_addr * dst, const char *address)

No bundle (reason: useless for push emails).