bzr commit into mysql-6.0-bugteam branch (alfranio.correia:2995)

[Alfranio Correia]

#At file:///home/acorreia/workspace.sun/repository.mysql/bzrwork/bug-44378/mysql-6.0-bugteam-push/ based on revid:joro@stripped

 2995 Alfranio Correia	2009-04-21 [merge]
      merge 5.1-bugteam --> 6.0-bugteam

    modified:
      sql/log_event.cc
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2009-01-31 15:53:35 +0000
+++ b/sql/log_event.cc	2009-04-21 13:22:41 +0000
@@ -9186,7 +9186,7 @@ Incident_log_event::Incident_log_event(c
     // If the incident is not recognized, this binlog event is
     // invalid.  If we set incident_number to INCIDENT_NONE, the
     // invalidity will be detected by is_valid().
-    incident_number= INCIDENT_NONE;
+    m_incident= INCIDENT_NONE;
     DBUG_VOID_RETURN;
   }
   m_incident= static_cast<Incident>(incident_number);


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