bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3265 to 3266) WL#5569

[Andrei Elkin]

 3266 Andrei Elkin	2010-12-24
      wl#5569 MTS
      
      the timed-wait loop of SQL thread required a break-through parameter in
      case the signal missed in action and just timeout would be reported

    modified:
      sql/rpl_slave.cc
 3265 Andrei Elkin	2010-12-23 [merge]
      merging from the repo wl5569

    modified:
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_stm_until.test
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-23 14:03:39 +0000
+++ b/sql/rpl_slave.cc	2010-12-23 23:57:03 +0000
@@ -6105,6 +6105,8 @@ static Log_event* next_event(Relay_log_i
           int ret= 0;
           struct timespec waittime;
           ulonglong period= static_cast<ulonglong>(mts_checkpoint_period * 1000000ULL);
+          ulong signal_cnt= rli->relay_log.signal_cnt;
+
           do
           {
             mts_checkpoint_routine(rli, period, FALSE, FALSE); // ALFRANIO ERROR
@@ -6114,7 +6116,8 @@ static Log_event* next_event(Relay_log_i
                             "waiting for the slave I/O "
                             "thread to update it");
             ret= rli->relay_log.wait_for_update_relay_log(thd, &waittime);
-          } while ((ret == ETIMEDOUT || ret == ETIME) && !thd->killed);
+          } while ((ret == ETIMEDOUT || ret == ETIME) /* todo:remove */ &&
+                   signal_cnt == rli->relay_log.signal_cnt && !thd->killed);
         }
         else
         {


Attachment: [text/bzr-bundle] bzr/[e-mail]