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

[Magnus Blåudd]

 4375 Magnus Blåudd	2011-05-12 [merge]
      Merge

    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test
      storage/ndb/src/common/portlib/NdbTCP.cpp
 4374 Magnus Blåudd	2011-05-12
      ndb
       - add a few lines at end of top level CMakeLists.txt to dump the contents of cmake's
        output and error(ie config.log) to stdout

    modified:
      CMakeLists.txt
=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test	2011-05-12 09:52:16 +0000
@@ -22,6 +22,13 @@ enable_query_log;
 --connection slave
 select count(*) from t1;
 
+# Add suppression for the LOST_EVENTS error message
+# which will occur on slave when master is restarted while
+# slave is running
+--disable_query_log
+call mtr.add_suppression("Slave.*: The incident LOST_EVENTS occured on the master");
+--enable_query_log
+
 --connection master
 
 --echo Restarting mysqld

=== 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).