bk commit into 5.1 tree (kroki:1.2415) BUG#22740

[kroki]

Below is the list of changes that have just been committed into a local
5.1 repository of tomash. When tomash does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-31 20:37:03+03:00, kroki@stripped +2 -0
  Fix for memory leaks introduces with the push of patch for bug#22740.
  
  Original patch did not have this leaks, they were introduced later
  during manual applying of the patch.

  sql/event_data_objects.cc@stripped, 2007-01-31 20:37:00+03:00, kroki@stripped +10 -5
    Original patch was not aware of the requirement to delete lex.sphead
    before doing anything else, and that was missed when the patch was
    applied later.

  sql/event_scheduler.cc@stripped, 2007-01-31 20:37:00+03:00, kroki@stripped +2 -0
    The line was lost during manual patch applying.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.home
# Root:	/home/tomash/src/mysql_ab/mysql-5.1-valgrind

--- 1.32/sql/event_scheduler.cc	2007-01-31 20:37:12 +03:00
+++ 1.33/sql/event_scheduler.cc	2007-01-31 20:37:12 +03:00
@@ -322,6 +322,8 @@ Event_worker_thread::run(THD *thd, Event
                           job_data->dbname.str, job_data->name.str,
                           job_data->definer.str);
   else if (ret == EVEX_MICROSECOND_UNSUP)
+    sql_print_information("SCHEDULER: MICROSECOND is not supported");
+
 end:
   delete job_data;
 

--- 1.84/sql/event_data_objects.cc	2007-01-31 20:37:12 +03:00
+++ 1.85/sql/event_data_objects.cc	2007-01-31 20:37:12 +03:00
@@ -1811,16 +1811,21 @@ Event_job_data::compile(THD *thd, MEM_RO
     DBUG_PRINT("error", ("error during compile or thd->is_fatal_error: %d",
                           thd->is_fatal_error));
     /*
-      Free lex associated resources
-      QQ: Do we really need all this stuff here?
+      The first thing we do after parse error is freeing sp_head to
+      ensure that we have restored original memroot.
     */
+    if (lex.sphead)
+    {
+      /* Clean up after failed stored procedure/function */
+      delete lex.sphead;
+      lex.sphead= NULL;
+    }
+    lex.unit.cleanup();
+
     sql_print_error("SCHEDULER: Error during compilation of %s.%s or "
                     "thd->is_fatal_error: %d",
                     dbname.str, name.str, thd->is_fatal_error);
 
-    lex.unit.cleanup();
-    delete lex.sphead;
-    sphead= lex.sphead= NULL;
     ret= EVEX_COMPILE_ERROR;
     goto done;
   }