From: Date: June 21 2005 7:05pm
Subject: bk commit into 4.1 tree (jimw:1.2304) BUG#11440
List-Archive: http://lists.mysql.com/internals/26255
X-Bug: 11440
Message-Id: <20050621170516.CCE6FA84FF@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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.2304 05/06/21 10:05:13 jimw@stripped +1 -0
  Restore creation of files for temporary tables in the tmpdir,
  which was broken by an earlier bug fix. (Bug #11440)

  sql/sql_table.cc
    1.289 05/06/21 09:33:19 jimw@stripped +4 -6
    Restore code to generate temporary tables in
    tmpdir

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-11440

--- 1.288/sql/sql_table.cc	2005-06-09 08:06:00 -07:00
+++ 1.289/sql/sql_table.cc	2005-06-21 09:33:19 -07:00
@@ -1339,14 +1339,12 @@
       /* Check if table exists */
   if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
   {
-    char tmp_table_name[tmp_file_prefix_length+22+22+22+3];
-    my_snprintf(tmp_table_name, sizeof(tmp_table_name), "%s%lx_%lx_%x",
-		tmp_file_prefix, current_pid, thd->thread_id,
-		thd->tmp_table++);
+    my_snprintf(path, sizeof(path), "%s%s%lx_%lx_%x%s",
+		mysql_tmpdir, tmp_file_prefix, current_pid, thd->thread_id,
+		thd->tmp_table++, reg_ext);
     if (lower_case_table_names)
-      my_casedn_str(files_charset_info, tmp_table_name);
+      my_casedn_str(files_charset_info, path);
     create_info->table_options|=HA_CREATE_DELAY_KEY_WRITE;
-    build_table_path(path, sizeof(path), db, tmp_table_name, reg_ext);
   }
   else
     build_table_path(path, sizeof(path), db, alias, reg_ext);