From: Jon Olav Hauglid
Date: August 26 2010 10:24am
Subject: bzr push into mysql-5.5-runtime branch (jon.hauglid:3121 to 3122) Bug#44171
List-Archive: http://lists.mysql.com/commits/116846
X-Bug: 44171
Message-Id: <201008261025.o7PHVRT8018297@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1371510117925206869=="

--===============1371510117925206869==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3122 Jon Olav Hauglid	2010-08-26
      Bug #44171 KILL ALTER EVENT can crash the server
      
      This assert could be triggered if ALTER EVENT failed to load the
      event after altering it. Failing to load the event could for 
      example happen because of KILL QUERY.
      
      The assert tested that the result of a failed load_named_event()
      was OP_LOAD_ERROR. However since load_named_event() returns bool,
      this assert did not make any sense. This patch therefore removes
      the assert, fixing the problem. The patch also removes 
      enum_events_error_code since it was unused.
      
      No test case added. The bug fix is trivial and this bug was
      easily detected by RQG tests. Further, adding a MTR test case
      for this bug would require adding sync points to make the
      test case repeatable.

    modified:
      sql/events.cc
      sql/events.h
 3121 Jon Olav Hauglid	2010-08-26 [merge]
      Merge from mysql-5.5-bugfixing to mysql-5.5-runtime.

    added:
      mysql-test/r/mysql_not_windows.result
      mysql-test/t/mysql_not_windows.test
    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/r/func_group.result
      mysql-test/r/mysql.result
      mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result
      mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result
      mysql-test/suite/ndb/r/ndb_binlog_log_bin.result
      mysql-test/suite/ndb/r/ndb_binlog_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
      mysql-test/t/func_group.test
      mysql-test/t/mysql.test
      sql/item.cc
=== modified file 'sql/events.cc'
--- a/sql/events.cc	2010-08-18 11:29:04 +0000
+++ b/sql/events.cc	2010-08-26 10:01:43 +0000
@@ -485,10 +485,7 @@ Events::update_event(THD *thd, Event_par
       ret= TRUE;                                // OOM
     else if ((ret= db_repository->load_named_event(thd, dbname, name,
                                                    new_element)))
-    {
-      DBUG_ASSERT(ret == OP_LOAD_ERROR);
       delete new_element;
-    }
     else
     {
       /*

=== modified file 'sql/events.h'
--- a/sql/events.h	2010-08-05 12:34:19 +0000
+++ b/sql/events.h	2010-08-26 10:01:43 +0000
@@ -44,19 +44,6 @@ class THD;
 typedef class Item COND;
 typedef struct charset_info_st CHARSET_INFO;
 
-/* Return codes */
-enum enum_events_error_code
-{
-  OP_OK= 0,
-  OP_NOT_RUNNING,
-  OP_CANT_KILL,
-  OP_CANT_INIT,
-  OP_DISABLED_EVENT,
-  OP_LOAD_ERROR,
-  OP_ALREADY_EXISTS
-};
-
-
 int
 sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs);
 


--===============1371510117925206869==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jon.hauglid@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.5-runtime-bug44171/
# testament_sha1: d50fe3de298c8dc1e6a1793adda1a355a63539a7
# timestamp: 2010-08-26 12:24:05 +0200
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   ht5xye4dptoeuuq3
# 
# Begin bundle
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
sTBPTUouNIGCyRKKQI/4u5IpwoSDb0jhIA==


--===============1371510117925206869==--