bzr push into mysql-trunk-cluster branch (magnus.blaudd:3411 to 3412) WL#5881

[magnus.blaudd]

 3412 magnus.blaudd@stripped	2011-11-15
      WL#5881
       - remove remaining MCP tags for 52305(aka. 53205...)

    modified:
      sql/log_event.cc
      sql/log_event.h
      sql/rpl_slave.cc
      sql/sql_class.cc
      sql/sql_class.h
 3411 magnus.blaudd@stripped	2011-11-15
      WL#5881
       - fix review comments, move extern declaration to mysqld.h
       - add comment about !generic
       - remove MCP tags

    modified:
      libmysqld/lib_sql.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_slave.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2011-09-07 10:08:09 +0000
+++ b/sql/log_event.cc	2011-11-15 14:10:26 +0000
@@ -664,11 +664,8 @@ Log_event::Log_event(THD* thd_arg, uint1
   crc(0), thd(thd_arg), checksum_alg(BINLOG_CHECKSUM_ALG_UNDEF)
 {
   server_id=	thd->server_id;
-  when=		thd->start_time;
-
-#ifndef MCP_BUG52305
   unmasked_server_id= server_id;
-#endif
+  when=		thd->start_time;
 }
 
 /**
@@ -685,16 +682,13 @@ Log_event::Log_event(enum_event_cache_ty
   checksum_alg(BINLOG_CHECKSUM_ALG_UNDEF)
 {
   server_id=	::server_id;
+  unmasked_server_id= server_id;
   /*
     We can't call my_time() here as this would cause a call before
     my_init() is called
   */
   when=		0;
   log_pos=	0;
-
-#ifndef MCP_BUG52305
-  unmasked_server_id= server_id;
-#endif
 }
 #endif /* !MYSQL_CLIENT */
 
@@ -715,7 +709,6 @@ Log_event::Log_event(const char* buf,
 #endif
   when = uint4korr(buf);
   server_id = uint4korr(buf + SERVER_ID_OFFSET);
-#ifndef MCP_BUG52305
   unmasked_server_id = server_id;
   /*
      Mask out any irrelevant parts of the server_id
@@ -725,7 +718,6 @@ Log_event::Log_event(const char* buf,
 #else
   server_id = unmasked_server_id;
 #endif
-#endif
   data_written= uint4korr(buf + EVENT_LEN_OFFSET);
   if (description_event->binlog_version==1)
   {

=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2011-11-14 15:00:16 +0000
+++ b/sql/log_event.h	2011-11-15 14:10:26 +0000
@@ -1054,14 +1054,12 @@ public:
   */
   uint32 server_id;
 
-#ifndef MCP_BUG52305
   /*
     The server id read from the Binlog.  server_id above has
     lowest bits of this only according to the value of
     opt_server_id_bits
   */
   uint32 unmasked_server_id;
-#endif
 
   /**
     Some 16 flags. See the definitions above for LOG_EVENT_TIME_F,

=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-11-15 13:42:05 +0000
+++ b/sql/rpl_slave.cc	2011-11-15 14:10:26 +0000
@@ -2804,13 +2804,11 @@ int apply_event_and_update_pos(Log_event
     log (remember that now the relay log starts with its Format_desc,
     has a Rotate etc).
   */
-#ifndef MCP_BUG52305
   /*
      Set the unmasked and actual server ids from the event
    */
-  thd->unmasked_server_id = ev->unmasked_server_id;
-#endif
   thd->server_id = ev->server_id; // use the original server id for logging
+  thd->unmasked_server_id = ev->unmasked_server_id;
   thd->set_time();                            // time the query
   thd->lex->current_select= 0;
   if (!ev->when)
@@ -5655,14 +5653,14 @@ static int queue_event(Master_info* mi,c
 
   mysql_mutex_lock(log_lock);
   s_id= uint4korr(buf + SERVER_ID_OFFSET);
-#ifndef MCP_BUG52305
+
   /*
     If server_id_bits option is set we need to mask out irrelevant bits
     when checking server_id, but we still put the full unmasked server_id
     into the Relay log so that it can be accessed when applying the event
   */
   s_id&= opt_server_id_mask;
-#endif
+
   if ((s_id == ::server_id && !mi->rli->replicate_same_server_id) ||
       /*
         the following conjunction deals with IGNORE_SERVER_IDS, if set

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2011-09-27 12:11:16 +0000
+++ b/sql/sql_class.cc	2011-11-15 14:10:26 +0000
@@ -868,9 +868,7 @@ THD::THD(bool enable_plugins)
   proc_info="login";
   where= THD::DEFAULT_WHERE;
   server_id = ::server_id;
-#ifndef MCP_BUG52305
   unmasked_server_id = server_id;
-#endif
   slave_net = 0;
   set_command(COM_CONNECT);
   *scramble= '\0';

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2011-09-27 12:11:16 +0000
+++ b/sql/sql_class.h	2011-11-15 14:10:26 +0000
@@ -1883,9 +1883,7 @@ private:
   enum enum_server_command m_command;
 
 public:
-#ifndef MCP_BUG52305
   uint32     unmasked_server_id;
-#endif
   uint32     server_id;
   uint32     file_id;			// for LOAD DATA INFILE
   /* remote (peer) port */

No bundle (reason: useless for push emails).