bzr push into mysql-next-mr.crash-safe branch (andrei.elkin:3225 to 3226) WL#5569

[Andrei Elkin]

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

    modified:
      sql/rpl_slave.cc
 3225 Alfranio Correia	2010-12-02
      Fixed commit_positions that was reseting group_relay_log_name and
      temporalily configure rpl_parallel.test to only execute in row mode.

    modified:
      mysql-test/suite/rpl/t/rpl_parallel.test
      sql/rpl_rli_pdb.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())


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