From: Date: October 28 2005 9:15am
Subject: bk commit into 5.0 tree (hf:1.1949) BUG#9551
List-Archive: http://lists.mysql.com/internals/31595
X-Bug: 9551
Message-Id: <200510280715.j9S7Frnl008301@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 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.1949 05/10/28 12:15:46 hf@deer.(none) +1 -0
  Fix for bug #9551 (Show commands fail)

  sql/sql_select.cc
    1.367 05/10/28 12:14:26 hf@deer.(none) +1 -1
    stop using temp_pool if we have TEST_KEEP_TMP_TABLES on

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

--- 1.366/sql/sql_select.cc	Mon Oct 24 11:36:18 2005
+++ 1.367/sql/sql_select.cc	Fri Oct 28 12:14:26 2005
@@ -8025,7 +8025,7 @@
 
   statistic_increment(thd->status_var.created_tmp_tables, &LOCK_status);
 
-  if (use_temp_pool)
+  if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES))
     temp_pool_slot = bitmap_set_next(&temp_pool);
 
   if (temp_pool_slot != MY_BIT_NONE) // we got a slot