bzr push into mysql-next-mr-rpl-merge branch (alfranio.correia:3017 to 3018)

[Alfranio Correia]

 3018 Alfranio Correia	2010-08-25
      Removed old comment.

    modified:
      sql/rpl_slave.cc
 3017 Alfranio Correia	2010-08-24
      Fixed the comments for the collection created to run the test cases with a table as repository.

    modified:
      mysql-test/collections/mysql-next-mr.crash-safe.daily
      mysql-test/collections/mysql-next-mr.crash-safe.push
      mysql-test/collections/mysql-next-mr.crash-safe.weekly
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-08-23 16:13:25 +0000
+++ b/sql/rpl_slave.cc	2010-08-25 22:02:49 +0000
@@ -3227,8 +3227,6 @@ Stopping slave I/O thread due to out-of-
 
       if (flush_master_info(mi, FALSE))
       {
-        // By default the option is TRUE, however we have changed it to do
-        // some tests. /Alfranio
         sql_print_error("Failed to flush master info file");
         goto err;
       }
@@ -5427,7 +5425,7 @@ bool change_master(THD* thd, Master_info
     ret= TRUE;
     goto err;
   }
-  thread_mask= SLAVE_IO | SLAVE_SQL; // Temporary Alfranio
+  thread_mask= SLAVE_IO | SLAVE_SQL;
 
   thd_proc_info(thd, "Changing master");
   /* 


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