From: Andrei Elkin
Date: November 18 2010 2:50pm
Subject: bzr commit into mysql-next-mr.crash-safe branch (andrei.elkin:3212) WL#5569
 WL#5599
List-Archive: http://lists.mysql.com/commits/124338
Message-Id: <201011181451.oAIEp18x019502@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0488201455=="

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

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped

 3212 Andrei Elkin	2010-11-18
      wl#5569 wl#5599
      
      Recovery related. Prototyping the worker RLI instantiation, to be elaborated on.

    modified:
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-11-18 14:00:52 +0000
+++ b/sql/rpl_slave.cc	2010-11-18 14:50:54 +0000
@@ -3524,7 +3524,13 @@ pthread_handler_t handle_slave_worker(vo
   w->tables_to_lock_count= 0;
 
   // fixme: experimenting to make Workers to run ev->update_pos(w->w_rli)
-  w->w_rli= Rpl_info_factory::create_rli(RLI_REPOSITORY_FILE, FALSE);
+  // fixme: a real hack! part of Rpl_info_factory::create_rli(RLI_REPOSITORY_FILE, FALSE);
+  w->w_rli= new Relay_log_info(FALSE,
+                               &key_relay_log_info_run_lock,
+                               &key_relay_log_info_data_lock,
+                               &key_relay_log_info_data_cond,
+                               &key_relay_log_info_start_cond,
+                               &key_relay_log_info_stop_cond);
   w->w_rli->info_thd= thd;
   w->w_rli->workers= rli->workers; // shallow copying is sufficient
   w->w_rli->this_worker= w;


--===============0488201455==
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: 586d238c2df6005038abc82ed0f48a29805a0d9d
# timestamp: 2010-11-18 16:51:01 +0200
# base_revision_id: andrei.elkin@stripped\
#   mqha481cp01dqa6i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW4Dr60AAZv/gAAQAAh5Z///
cyTcIL////BQA/pt5W1zjszCjhohMqbyTI0npkbVP1R6nqZDTRtQNPRMm1NAympPIp+TU/SmNSep
6nqND1AAAAAASRExJtIMmgp5BqGg0PUBkaAAcwAEyYAEwmCYQwBGABJQgm1NpGmIMinqHoep6mKG
xR6IDR6mzLhvb6RPhjt1IpTI34vVBui7Du+gEOlF9XOrMxd8DipjYJEi4lKYqWrhft7ador3c/vd
so1UKkVZdgSBvyPsxS57IZqmU5CQZCcaCFLMPVltlBoBwkHAEHQkGkEt+sA3XYXCO0zS+8EwuJGq
Yoe1cmg4MyDwG2VhgIcQafwGwgc2kDi+8oWjmp1bNULM041JMp8rAXYx0bieyIQ8Q6KSI0VYg3KH
McKua+cRTb8BNPoRGPK8H5ApaaQ1TCPi2y3RXLpYzLlgW1OCI9h5qITlzN8biV96sK3EyzKnFoR/
JryKWJagYZYsuLCd94M42Eg/+MqFAK1nucJkDMee1jAa4rnGilt3l2qxlKzGebkEMYoqnEWjTACh
ca1G2mqyy7gFRtlIwr0XhC44aWEXhyexYluu6yuESAt9J/svY0DUxnxJxICvCDBArX2qJSCjM++i
T3xccqqyIrhBrKrUGsELKTUGgL6DXaKbQ+rFHpnSYh36tCyIXCfojMjGviN6uOMXXxNYjawcBy5R
uabuUiQ4Jc69Htpz7CnR02lqMkALi8CIYRder3j2lMQGs6B3ynbgTU4uqR58DJvwzSA8j8rKI/AP
EwGN9o7aRN8jeTvrig1By+UrCxpy5bNBIZFS4VAtJeHNcxhjg+LopSaaT7W1UG4a1ImSMnFTbQrF
GUS1WPpw6sMaF9qkmnBVJ9x6BU1k+gzhmBZsO/hZzJABRE+aqWGg6HitDVgJjrBgm+ZqE0MMp5t7
QCnTJQee9AsZKZCMiBigjJ1dGPseybMMAEwYTSCnvygy8WGbXtpPe7uwaRx5TNf3ai6YrAcd43OV
C/AoIo7G3cbjYHAIbKOItpUrY72pDRjczmVS3JmwI7ipNIdYBWiXCPy46pUxDAOVYYbxxRNiG1/1
EgWkO0p7jebwe4JwDWMQTC5XpDFS3vsSMOecC7kkUXXbsuMesyo8pFOlD0JIZIavCcFEPCCRCM7E
Dc/SZo4FGTsmV64ttFpcWBSri2AqEGTq6y1nZIaGFr1PEFMrZkQtV5JRnYxMjHa+nHG8U+rE+/wC
AZyW3dF1nSWttNbQT9KKIr1RLzNK1hlD35Rz+HdUttkzstAqao5+pifQDaxTWEJFe5n3ZjCRcjRt
j5O0jGMSBpTus+w5N6o5UtuIyzIsXim82WUOw2eU28qn7ALYmBfmEyM/bJL2dI0OAiRAFCJ7lDRE
N/xdyRThQkG4Dr60


--===============0488201455==--