From: Andrei Elkin
Date: December 23 2010 11:57pm
Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3265 to 3266) WL#5569
List-Archive: http://lists.mysql.com/commits/127570
Message-Id: <201012232357.oBNNvdgd003462@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1255590689=="

--===============1255590689==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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
         {


--===============1255590689==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/andrei.elkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl5569/
# testament_sha1: 843225c65c803413a0abc06a7e65063fa47485c7
# timestamp: 2010-12-24 01:57:39 +0200
# base_revision_id: andrei.elkin@stripped\
#   o4118ajac5hq4xtn
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeJtrpIAAbPfgAEQ+XP//3Ym
rgC////2UAQKe7oVx3brmDpCURNU9MT1MSeo9CeQxJiYmpptNQ9QbU0xqDJEGptMk9U/QRqDQABo
xPUAaA0CSRGENAgmymin6TyUeg0R6hkYgYahzAJgJkYARiYmEwmCGmJpgJIk1Mpo9E9Tan6mpjUA
NqNAAAAA0x0VOazlyPSg2Uk1JVQ96EahUKtddUDFwiCpJV68Ho7LpiiIavAMkYsVLGNEkWtEmmPG
J5cMJgne/y/Ncpb6z/x2VsUPy0mIP20ZxWTZ0Z+cuJ+TFjpyTIxUOysjDdd9qc7nnMQidgM6P6x0
+lO8TNaR2LndTUImuUQzmWgnfCyLPFLDa9pkUxgGERQmLCIoHS4RgXOPfIqeChVWPqmiznWC8mLF
ob9rPonVP8oCItfTO6eHgveO9LnMYMUxdes5njUFh0YSh8UFYrLGV0AjWN6UkRuBMxOwYt35HChP
YwbvoW45bRYOcavuZBOq5ldvxUBMQvuvbgQ5f6dXAwFYHcpp25psrCrIb/rRMsIX5w2Ur30+HaH4
WTGYUlU8MSu7q7MlrzK7DiieWUiECwhbjHdfKA5PwipmGJcVP+ouzcqQkWieq3VctO/8SeNTy8Oy
jIFVXFVsI3JRO1DtODcYNNRtrDVQDNwF9LBw7XkhimzlffkRCmy5UnELXRqaFriI5N1RdWTCN5WU
/V/mb0gI69WRikKd+3bpTNeEMT4wU3Hq1ZE8j+8xvP7ub7RF72sDB2vQ4Hv4QHVI0NmgttxDd3TU
eabeCIX5yZofMZrR1CGZ7IaFjclpcKz/OulE7dCY0N7TsPLrNZhpbQXIoVJRJh05IzHFGfTO9dW3
ky6jMkfoXkipFusQTrVwtVS3NB2FzTFhVKbqHXji0TkidUMEwjBJDICQzehO3Bx12NaaWRRBdfXi
LZL1RxRd1kNUqyfgvohAqyrbn/jis5CGW9Mr2L6bXZdesSIzBfBP12FM9OBYSas2nkJbeJYDRUrZ
TCeNyGqVCa+Jh6Hhbct2+sRlYWrFtHNwqYyhgewcQ4xIsu0Jo7xSiqSuiFo7MJU+m5ihTPfDNWHB
stNXAkJlVhvGOZnx56EiQQKxRs5mgOoEnhWHSpPMe4vSGIx6xvKIjfCWA2c+iRYrInBnNDb3GyTq
RkT7XeJaEnDDM4Q3oRdIqDzcI4qEZwe6uXoLdxRhgkyZYJpLHjSWGZYCki15Xe3mkSC5S0HqENcL
6m1XgZixN7MqyHGyd2kIz5dF1CvJTOE3KiSf7ds3cNEjHuMZI2Lo/k8zH76xUZOy+WMNM4xIBNYt
6nC1KHZ9iKsAkoFiKYHakVnvlxdRGe3KodDKL/H2DiLPK21ljmdPN2rZfrdpZWZnfRPvDAIMs/Ub
OZrd0bn52/nVGYnZK5d5oG7LUW577SsDQazQH8yrBkBeGbGx/xdyRThQkOJtrpI=


--===============1255590689==--