List:Commits« Previous MessageNext Message »
From:Mikael Ronstrom Date:December 23 2009 2:09pm
Subject:bzr commit into mysql-5.5-next-mr branch (mikael:2949)
View as plain text  
#At file:///home/mikael/mysql_clones/wl5136_v19/ based on revid:mikael@stripped

 2949 Mikael Ronstrom	2009-12-23
      Fixed compile issue in scheduler_poll.cc

    modified:
      sql/scheduler_poll.cc
      sql/scheduler_thread_pool.cc
=== modified file 'sql/scheduler_poll.cc'
--- a/sql/scheduler_poll.cc	2009-12-16 22:28:05 +0000
+++ b/sql/scheduler_poll.cc	2009-12-23 14:09:19 +0000
@@ -219,7 +219,7 @@ static int tp_group_low_level_wait_for_e
     /* Clean up all client errors */
     for (client_count= 0; client_count < clients_valid; client_count++)
     {
-      client_index= client_count + TP_FIRST_REAL_FD;
+      client_index= client_count + TP_POLL_FIRST_REAL_FD;
 
       if ((tp_group_low_level_cntx->array[client_index].revents & POLLERR) ||
           (tp_group_low_level_cntx->array[client_index].revents & POLLHUP))
@@ -256,7 +256,8 @@ static int tp_group_low_level_wait_for_e
       for (client_count= 0; client_count < clients_valid; client_count++)
       {
         client_index= (tp_group_low_level_cntx->last_check &
-                              MAX_THREADS_PER_GROUP_MASK) + TP_FIRST_REAL_FD;
+                              MAX_THREADS_PER_GROUP_MASK) +
+                       TP_POLL_FIRST_REAL_FD;
         if ((tp_group_low_level_cntx->array[client_index].revents & POLLIN) ||
             (tp_group_low_level_cntx->array[client_index].revents & POLLPRI))
         {
@@ -290,7 +291,8 @@ static int tp_group_low_level_wait_for_e
         for (client_count= 0; client_count < clients_valid; client_count++)
         {
           client_index= (tp_group_low_level_cntx->last_check &
-                                MAX_THREADS_PER_GROUP_MASK) + TP_FIRST_REAL_FD;
+                                MAX_THREADS_PER_GROUP_MASK) +
+                         TP_POLL_FIRST_REAL_FD;
           tp_group_low_level_cntx->last_check++;
           if (tp_group_low_level_cntx->array[client_index].revents != 0)
           {
@@ -358,7 +360,9 @@ static tp_client_low_level_t tp_client_l
   /*
     Start at 2 as first 2 sockets are special internal only.
   */
-  for (client_index= TP_FIRST_REAL_FD; client_index < TP_POLL_MAX_FDS; client_index++)
+  for (client_index= TP_POLL_FIRST_REAL_FD;
+        client_index < TP_POLL_MAX_FDS;
+        client_index++)
   {
     /* Find first non-used client index */
     if (tp_group_low_level_cntx->array[client_index].fd == 0)

=== modified file 'sql/scheduler_thread_pool.cc'
--- a/sql/scheduler_thread_pool.cc	2009-12-22 18:50:13 +0000
+++ b/sql/scheduler_thread_pool.cc	2009-12-23 14:09:19 +0000
@@ -1147,8 +1147,8 @@ void thd_pool_wait_end(THD *thd)
 /*********************************************************************/
 /*********************************************************************/
 
-#define HAVE_EPOLL_X
-//#define HAVE_POLL_X
+//#define HAVE_EPOLL_X
+#define HAVE_POLL_X
 #ifdef HAVE_EPOLL_X
 #include "scheduler_epoll.cc"
 #endif


Attachment: [text/bzr-bundle] bzr/mikael@mysql.com-20091223140919-nfykm2m4locjce4r.bundle
Thread
bzr commit into mysql-5.5-next-mr branch (mikael:2949) Mikael Ronstrom23 Dec