bzr commit into mysql-next-mr-wl5569 branch (alfranio.correia:3236) WL#5599

[Alfranio Correia]

#At file:///home/acorreia/workspace.sun/repository.mysql.new/bzrwork/wl-5569/mysql-next-mr-wl5569/ based on revid:alfranio.correia@stripped

 3236 Alfranio Correia	2010-12-08
      WL#5599
      
      Fixed warning messages.

    modified:
      sql/rpl_rli_pdb.cc
      sql/rpl_slave.cc
=== modified file 'sql/rpl_rli_pdb.cc'
--- a/sql/rpl_rli_pdb.cc	2010-12-08 12:59:07 +0000
+++ b/sql/rpl_rli_pdb.cc	2010-12-08 13:59:07 +0000
@@ -598,7 +598,6 @@ ulong circular_buffer_queue::de_queue(uc
 */
 ulong circular_buffer_queue::de_tail(uchar *val)
 {
-  ulong ret;
   if (e == s)
   {
     DBUG_ASSERT(len == 0);
@@ -618,7 +617,6 @@ ulong circular_buffer_queue::de_tail(uch
                (s + a - e)));
 
   return a;
-
 }
 /** 
     @return the used index at success or -1 when queue is full

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-08 00:33:48 +0000
+++ b/sql/rpl_slave.cc	2010-12-08 13:59:07 +0000
@@ -392,7 +392,7 @@ int init_recovery(Master_info* mi, const
     rli->set_event_relay_log_pos(BIN_LOG_HEADER_SIZE);
   }
 
-err:
+// err:
   DBUG_RETURN(error);
 }
 
@@ -4051,7 +4051,7 @@ int slave_start_workers(Relay_log_info *
   rli->mts_coordinator_basic_nap= ::opt_mts_coordinator_basic_nap;
   rli->mts_worker_underrun_level= ::opt_mts_worker_underrun_level;
   rli->mts_total_groups= 0;
-  rli->curr_group_seen_begin= NULL;
+  rli->curr_group_seen_begin= 0;
   rli->run_query_in_parallel= opt_slave_run_query_in_parallel;
   for (i= 0; i < n; i++)
   {
@@ -5671,7 +5671,7 @@ static Log_event* next_event(Relay_log_i
       */
       if (rli->is_parallel_exec() && rli->lwm_period != 0.0)
       {
-        ulong period= rli->lwm_period * 1000000000UL;
+        ulong period= static_cast<ulong>(rli->lwm_period * 1000000000UL);
         mts_checkpoint_routine(rli, period, TRUE); // ALFRANIO --- WHAT TO DO with ERRORS?
       }
 
@@ -5798,7 +5798,7 @@ static Log_event* next_event(Relay_log_i
         {
           int ret= 0;
           struct timespec waittime;
-          ulong period= rli->lwm_period * 1000000000UL;
+          ulong period= static_cast<ulong>(rli->lwm_period * 1000000000UL);
           do
           {
             mts_checkpoint_routine(rli, period, FALSE); // ALFRANIO ERROR


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