bzr commit into mysql-next-mr.crash-safe branch (andrei.elkin:3212) WL#5569 WL#5599

[Andrei Elkin]

#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;


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