From: Chaithra Gopalareddy
Date: February 24 2012 6:34am
Subject: bzr push into mysql-trunk branch (chaithra.gopalareddy:3953 to 3954)
List-Archive: http://lists.mysql.com/commits/143061
Message-Id: <201202240635.q1O6ZX3Z017938@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3954 Chaithra Gopalareddy	2012-02-24 [merge]
      Null merge from 5.5 to 5.6

 3953 Dmitry Shulga	2012-02-24
      Follow-up for patch for bug#1174899.
      
      Event_queue::create_event() deletes an Event_queue_element object as its
      side effect. Subsequently, the attribute 'Event_queue_element::dropped'
      is used to check whether event should be deleted from table. An access
      to attribute of already deleted object could incur a fault. To protect
      against such failure we save the value of Event_queue_element::dropped
      attribute into a temporary variable to use it subsequently after
      return from Event_queue::create_event.
      
      events_restart.test re-enabled.

    modified:
      mysql-test/t/disabled.def
      sql/events.cc
No bundle (reason: useless for push emails).