bzr commit into mysql-trunk branch (Dmitry.Shulga:3124) Bug#12546938

[Dmitry Shulga]

#At file:///Users/shulga/projects/mysql/mysql-trunk/ based on revid:dmitry.shulga@stripped

 3124 Dmitry Shulga	2011-05-27
      Follow-up for patch for bug#12546938.

    modified:
      sql/events.cc
=== modified file 'sql/events.cc'
--- a/sql/events.cc	2011-05-27 11:50:52 +0000
+++ b/sql/events.cc	2011-05-27 12:21:55 +0000
@@ -352,7 +352,7 @@ Events::create_event(THD *thd, Event_par
     Event_queue_element *new_element;
     bool dropped= 0;
 
-    if (!event_already_exists)
+    if (event_queue && !event_already_exists)
     {
       if (!(new_element= new Event_queue_element()))
         ret= TRUE;                                // OOM
@@ -369,8 +369,7 @@ Events::create_event(THD *thd, Event_par
       {
         /* TODO: do not ignore the out parameter and a possible OOM error! */
         bool created;
-        if (event_queue)
-          event_queue->create_event(thd, new_element, &created);
+        event_queue->create_event(thd, new_element, &created);
       }
     }
     /*


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