From: Date: February 25 2006 7:15pm
Subject: bk commit into 5.1 tree (holyfoot:1.2177) BUG#17290
List-Archive: http://lists.mysql.com/commits/3141
X-Bug: 17290
Message-Id: <20060225181542.DEFF4A0809A@deer.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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.2177 06/02/25 22:15:28 holyfoot@deer.(none) +2 -0
  bug #17290 (SP with delete, create and rollback to save point causes mysqld core)

  sql/sp_head.cc
    1.207 06/02/25 22:13:38 holyfoot@stripped +13 -0
    now we clean the lex->part_info before the next run

  sql/partition_info.h
    1.3 06/02/25 22:13:38 holyfoot@stripped +1 -0
    sav_no_parts added

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.1.17290

--- 1.206/sql/sp_head.cc	Thu Feb 23 13:49:37 2006
+++ 1.207/sql/sp_head.cc	Sat Feb 25 22:13:38 2006
@@ -2188,6 +2188,19 @@
     sp_head::execute() when we are entering/leaving routine.
   */
   thd->lex= m_lex;
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+  if (m_lex->part_info)
+  {
+    if (m_lex->part_info->default_partitions_setup)
+    {
+      m_lex->part_info->default_partitions_setup= 0;
+      if (!m_lex->part_info->sav_no_parts)
+        m_lex->part_info->partitions.empty();
+    }
+    else
+      m_lex->part_info->sav_no_parts= m_lex->part_info->no_parts;
+  }
+#endif
 
   VOID(pthread_mutex_lock(&LOCK_thread_count));
   thd->query_id= next_query_id();

--- 1.2/sql/partition_info.h	Wed Feb 22 03:39:57 2006
+++ 1.3/sql/partition_info.h	Sat Feb 25 22:13:38 2006
@@ -152,6 +152,7 @@
   uint subpart_func_len;
 
   uint no_parts;
+  uint sav_no_parts;
   uint no_subparts;
   uint count_curr_subparts;