bk commit into 5.0 tree (petr:1.1987)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps 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
  1.1987 05/08/17 17:15:23 petr@stripped +1 -0
  Fix issues popped up during testing

  sql/sp_head.cc
    1.168 05/08/17 17:15:18 petr@stripped +6 -3
    Fix instruction cleanup to cleanup right free_list.
    Fix handler processing to save vars in the correct arena.

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/devel/mysql-5.0-sp11247

--- 1.167/sql/sp_head.cc	2005-08-17 00:51:32 +04:00
+++ 1.168/sql/sp_head.cc	2005-08-17 17:15:18 +04:00
@@ -731,7 +731,8 @@
       cleanup_items(i->free_list);
     i->state= Query_arena::EXECUTED;
 
-    execute_arena.free_items();
+    /* we should cleanup free_list and memroot, used by instruction */
+    thd->free_items();
     free_root(&execute_mem_root, MYF(0));
 
     /*
@@ -750,8 +751,10 @@
       case SP_HANDLER_NONE:
 	break;
       case SP_HANDLER_CONTINUE:
-	ctx->save_variables(hf);
-	ctx->push_hstack(ip);
+        thd->restore_backup_item_arena(&execute_arena, &execute_backup_arena);
+        ctx->save_variables(hf);
+        thd->set_n_backup_item_arena(&execute_arena, &execute_backup_arena);
+        ctx->push_hstack(ip);
         // Fall through
       default:
 	ip= hip;