From: Andrei Elkin
Date: December 2 2010 1:16pm
Subject: bzr commit into mysql-next-mr.crash-safe branch (andrei.elkin:3226) WL#5569
List-Archive: http://lists.mysql.com/commits/125803
Message-Id: <201012021316.oB2DGRLn012114@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1886834307=="

--===============1886834307==
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/wl5569-pure-repo/ based on revid:alfranio.correia@stripped

 3226 Andrei Elkin	2010-12-02
      wl#5569
      
      fixing a compilation issue in rpl_slave.cc

    modified:
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-01 19:15:08 +0000
+++ b/sql/rpl_slave.cc	2010-12-02 13:16:13 +0000
@@ -3829,8 +3829,7 @@ int slave_start_workers(Relay_log_info *
   rli->last_assigned_worker= NULL; /* associated with curr_group_assigned */
   my_init_dynamic_array(&rli->curr_group_da, sizeof(Log_event*), 8, 2);
   // Least_occupied_workers array
-  my_init_dynamic_array(&rli->least_occupied_workers,
-                        sizeof(Slave_jobs_queue::len), n, 0);
+  my_init_dynamic_array(&rli->least_occupied_workers, sizeof(ulong), n, 0);
 
   // GAQ  queue holds seqno:s of scheduled groups. C polls workers in 
   //      @c lwm_checkpoint_period to update GAQ (see @c next_event())


--===============1886834307==
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/wl5569-\
#   pure-repo/
# testament_sha1: f090d937301709c5db974731b1bb55bf255d9b96
# timestamp: 2010-12-02 15:16:27 +0200
# base_revision_id: alfranio.correia@stripped\
#   ac9b05j6i2w30eve
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX+sRPoAAYjfgAAQWWf//3IA
AAC////wUAOne9e29lro9z3hsJRCNE1T8CaaNNNNNDFTyaaTBGgklGjINNU2SM0T0EGRoABoJSaG
kxU8k/VMnlGm0gAaABoDJKPUxG1HpHpNNqMagAAAAkkTQ0m1NJtMmiaaaZMmjQ0aaBNbtX105ltV
taMbRIBasELLXMesE/RyqpX69k+IH3MK1apDD307eP96NfdNR8KjmsOu/XNPv26DFE9udM/nhZqp
v+Zz3BErYDeY7HMXTM0PrJmWSdADCXMkXRHCSIsQIkEG2kIDCHjMkMgZFgzk4pTqMZqKi1Ug6LlC
qOcmfrEE8nFUlkVppwndFlEJ6F548VXibrxMuxVnSVcC0W+mO+or5DGd90ZbL7R5NpKhFQh6vvQa
cR9JJglPH7Ok0/VGZQuYU99xg79WUwrJqEzGULRrJa1ZXa94ljHIilUnfng7l1DGovU2lDfQSkc2
hoq57JTmgyFzlEnCbEMY15mFkxAWXAjZmsIFCreoozISIsmcK2kvEtTXKayyCnjkyd+Aj5SDCuPM
bySzFOTYTL3YcEzbimpkWkqzbKnCKwpZalpEJERgmMl1Ngl1Z4YhSsHunFzaFIKjmdAuBpOjLx0+
hx6/CiJrDr798rgiRNJIxVF+2S7pnq70UGeMmHApjclYu2nIO3B/PXDikTycEQLQpyFkLzONP1mD
PWj9loWxCGbvWhxS3czHO1cx8p21wmASJqdyJq039fISdtTy98GZIekV75gfK2RLbPsqjbxLlBNw
crCWwoAdfyw47OPkGgkgvfuUGnTB65siiDHFri+pkpc5Tk1XLX7VAWKHiGFeXyw5okJqRU2Lmyvp
LfVuJkjB6NpqLKijHlYMN5KTfvnkuGhwcZcQVpsP0JkhL+GvEpYItwFwG7WGmd+BRKgwoCoi+9G8
dhSiKAU42hPYiEjHfHppthII3BmDFN2SgZmuOCgZxrpwMgQOPTAHVBO8LzXMDYkhtjcMYSbnFK70
K96RQqMKh1uwuksGHyyuHuVUVEcvs0A/lRIvHdLwf57idkIOTvFMrkwS88n6oYoT0V56Tmkbwyio
BW5X3yyXiVaNLMqB+3XPIwi5z7d8acYLXakt2ARjxAmCCLY7cxIjqjzZO69FF/tVGAVjBdDO66TF
mQNX3QV7njR+WnrqumsC1p83Impno5DNGRu8oYRFhEdWFgOZW8DHvLqO3lufpnqFWF6ctY4NS+RW
5TVZ1LaVmrY2zvIKQ3+LuSKcKEg/1iJ9AA==


--===============1886834307==--