bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3276)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/5.5-cluster/ based on revid:magnus.blaudd@stripped6

 3276 Magnus Blåudd	2011-04-07
      ndb
       - backport missing pieces of MCP patch for BUG11765707
         to 5.5-cluster

    modified:
      sql/log.cc
      sql/log_event.h
=== modified file 'sql/log.cc'
--- a/sql/log.cc	2011-03-15 14:55:57 +0000
+++ b/sql/log.cc	2011-04-07 13:37:56 +0000
@@ -4900,7 +4900,12 @@ bool MYSQL_BIN_LOG::write(Log_event *eve
     if ((thd && !(thd->variables.option_bits & OPTION_BIN_LOG)) ||
 	(thd->lex->sql_command != SQLCOM_ROLLBACK_TO_SAVEPOINT &&
          thd->lex->sql_command != SQLCOM_SAVEPOINT &&
+#ifndef MCP_BUG11799583
+         ((event_info->flags & LOG_EVENT_NO_FILTER_F) == 0 &&
+          !binlog_filter->db_ok(local_db))))
+#else
          !binlog_filter->db_ok(local_db)))
+#endif
       DBUG_RETURN(0);
 #endif /* HAVE_REPLICATION */
 

=== modified file 'sql/log_event.h'
--- a/sql/log_event.h	2011-03-15 14:55:57 +0000
+++ b/sql/log_event.h	2011-04-07 13:37:56 +0000
@@ -4003,7 +4003,11 @@ class Incident_log_event : public Log_ev
 public:
 #ifdef MYSQL_SERVER
   Incident_log_event(THD *thd_arg, Incident incident)
+#ifndef MCP_BUG11799583
+    : Log_event(thd_arg, LOG_EVENT_NO_FILTER_F, FALSE), m_incident(incident)
+#else
     : Log_event(thd_arg, 0, FALSE), m_incident(incident)
+#endif
   {
     DBUG_ENTER("Incident_log_event::Incident_log_event");
     DBUG_PRINT("enter", ("m_incident: %d", m_incident));
@@ -4014,7 +4018,11 @@ public:
   }
 
   Incident_log_event(THD *thd_arg, Incident incident, LEX_STRING const msg)
+#ifndef MCP_BUG11799583
+    : Log_event(thd_arg, LOG_EVENT_NO_FILTER_F, FALSE), m_incident(incident)
+#else
     : Log_event(thd_arg, 0, FALSE), m_incident(incident)
+#endif
   {
     DBUG_ENTER("Incident_log_event::Incident_log_event");
     DBUG_PRINT("enter", ("m_incident: %d", m_incident));

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