bk commit into 5.1 tree (mikron:1.2448)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-08 20:25:04+01:00, mikron@stripped +3 -0
  Temporarily disable epoll feature

  storage/ndb/include/transporter/TransporterRegistry.hpp@stripped, 2007-03-08 20:25:01+01:00,
mikron@stripped +1 -1
    Temporarily disable epoll feature

  storage/ndb/src/common/transporter/TransporterRegistry.cpp@stripped, 2007-03-08
20:25:01+01:00, mikron@stripped +1 -1
    Temporarily disable epoll feature

  storage/ndb/src/kernel/vm/Configuration.cpp@stripped, 2007-03-08 20:25:01+01:00,
mikron@stripped +1 -1
    Temporarily disable epoll feature

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mikron
# Host:	21.37.251.10.in-addr.arpa
# Root:	/Users/mikron/mysql_clones/bench_11

--- 1.32/storage/ndb/include/transporter/TransporterRegistry.hpp	2007-02-20 17:57:50
+01:00
+++ 1.33/storage/ndb/include/transporter/TransporterRegistry.hpp	2007-03-08 20:25:01
+01:00
@@ -26,7 +26,7 @@
 //***************************************************************************/
 #ifndef TransporterRegistry_H
 #define TransporterRegistry_H
-
+#undef HAVE_EPOLL_CREATE
 #if defined(HAVE_EPOLL_CREATE) && defined(HAVE_POLL)
 #include <sys/poll.h>
 #include <sys/epoll.h>

--- 1.80/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2007-03-06 22:47:36
+01:00
+++ 1.81/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2007-03-08 20:25:01
+01:00
@@ -48,7 +48,7 @@
 
 #include <EventLogger.hpp>
 extern EventLogger g_eventLogger;
-
+#undef HAVE_EPOLL_CREATE
 struct in_addr
 TransporterRegistry::get_connect_address(NodeId node_id) const
 {

--- 1.60/storage/ndb/src/kernel/vm/Configuration.cpp	2007-03-08 19:53:21 +01:00
+++ 1.61/storage/ndb/src/kernel/vm/Configuration.cpp	2007-03-08 20:25:01 +01:00
@@ -1050,7 +1050,7 @@
 int
 Configuration::setRealtimeScheduler(NDB_THAND_TYPE threadHandle,
                                     enum ThreadTypes type,
-                                    bool real_time
+                                    bool real_time,
                                     bool init)
 {
   /*