bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3349 to 3350) WL#5569

[Andrei Elkin]

 3350 Andrei Elkin	2011-07-17
      wl#5569 MTS
      
      fixing build issue for embedded.
      Public visibility for Rows_log_event::do_apply_event() is restored.

    modified:
      sql/log_event.h
      sql/rpl_rli_pdb.h
 3349 Andrei Elkin	2011-07-16
      wl#5569 MTS
      
      The patch contains improvements after code review.
      Changes are mostly consmetic.
     @ mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
        results updated.
     @ sql/binlog.cc
        correcting comments.
     @ sql/field.cc
        renaming.
     @ sql/log_event.cc
        renaming and separating out a block of code in Log_event::get_slave_worker()
        into a new method of Slave_job_group class;
        some cleanup.
     @ sql/log_event.h
        Extending and improving comments;
        renaming to follow is_, get_, set_ pattern;
        restoring the private access to do_apply_event() in Rows_log_event.
     @ sql/mysqld.cc
        removing extra declaration.
     @ sql/rpl_info_factory.cc
        Minor comments is added.
     @ sql/rpl_rli.cc
        renaming to make _cnt suffix to all entities that have counter meaning in mts;
        improving comments.
     @ sql/rpl_rli.h
        Renaming, and improving comments for the new members to Relay_log_info.
     @ sql/rpl_rli_pdb.cc
        remaning.
     @ sql/rpl_rli_pdb.h
        Improving comments readability through adding legengs
        defining MTS specific abbreviations.
     @ sql/rpl_slave.cc
        Renaming;
        minor cleanup in sql_slave_killed();
        adding comments on Seconds_behind_master update policy with MTS.
     @ sql/share/errmsg-utf8.txt
        Improving text of few errors.

    modified:
      mysql-test/suite/rpl/r/rpl_parallel_start_stop.result
      sql/binlog.cc
      sql/field.cc
      sql/log_event.cc
      sql/log_event.h
      sql/mysqld.cc
      sql/rpl_info_factory.cc
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
      sql/share/errmsg-utf8.txt
=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2011-07-16 17:08:31 +0000
+++ b/sql/log_event.h	2011-07-16 21:51:45 +0000
@@ -4468,11 +4468,11 @@ public:
   {
     return IGNORABLE_HEADER_LEN + 1 + (uint) strlen(m_rows_query);
   }
+#if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION)
+  virtual int do_apply_event(Relay_log_info const *rli);
+#endif
 
 private:
-#if !defined(MYSQL_CLIENT)
-  virtual int do_apply_event(Relay_log_info const* rli);
-#endif
 
   char * m_rows_query;
 };

=== modified file 'sql/rpl_rli_pdb.h'
--- a/sql/rpl_rli_pdb.h	2011-07-16 17:08:31 +0000
+++ b/sql/rpl_rli_pdb.h	2011-07-16 21:51:45 +0000
@@ -2,6 +2,8 @@
 
 #define RPL_RLI_PDB_H
 
+#ifdef HAVE_REPLICATION
+
 #include "sql_string.h"
 #include "rpl_rli.h"
 #include <my_sys.h>
@@ -363,6 +365,8 @@ private:
 TABLE* mts_move_temp_table_to_entry(TABLE*, THD*, db_worker_hash_entry*);
 TABLE* mts_move_temp_tables_to_thd(THD*, TABLE*);
 
+#endif // HAVE_REPLICATION
+
 #ifndef DBUG_OFF
   extern ulong w_rr;
 #endif

No bundle (reason: useless for push emails).