List:Commits« Previous MessageNext Message »
From:konstantin Date:November 28 2006 6:35pm
Subject:bk commit into 5.1 tree (kostja:1.2374) BUG#24486
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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, 2006-11-28 21:35:20+03:00, kostja@stripped +1 -0
  A fix for Bug#24486 "Valgrind warnings: sp_head(), 
  deadlock_innodb:events_grant". This was a memory leak introduced by 
  the patch for Bug 22830.
  Post-review fixes.

  sql/sql_parse.cc@stripped, 2006-11-28 21:35:15+03:00, kostja@stripped +9 -9
    A fix for Bug#24486 "Valgrind warnings: sp_head(),
     deadlock_innodb:events_grant": delete the sphead object before
    returning with an error.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-24486

--- 1.595/sql/sql_parse.cc	2006-11-28 21:35:30 +03:00
+++ 1.596/sql/sql_parse.cc	2006-11-28 21:35:30 +03:00
@@ -3925,6 +3925,7 @@ end_with_restore_list:
   }
   case SQLCOM_CREATE_EVENT:
   case SQLCOM_ALTER_EVENT:
+  do
   {
     DBUG_ASSERT(lex->event_parse_data);
     if (lex->table_or_sp_used())
@@ -3950,16 +3951,15 @@ end_with_restore_list:
     if (!res)
       send_ok(thd);
 
-    /* Don't do it, if we are inside a SP */
-    if (!thd->spcont)
-    {
-      delete lex->sphead;
-      lex->sphead= NULL;
-    }
-
-    /* lex->unit.cleanup() is called outside, no need to call it here */
-    break;
+  } while (0);
+  /* Don't do it, if we are inside a SP */
+  if (!thd->spcont)
+  {
+    delete lex->sphead;
+    lex->sphead= NULL;
   }
+  /* lex->unit.cleanup() is called outside, no need to call it here */
+  break;
   case SQLCOM_DROP_EVENT:
   case SQLCOM_SHOW_CREATE_EVENT:
   {
Thread
bk commit into 5.1 tree (kostja:1.2374) BUG#24486konstantin28 Nov