From: Date: February 13 2006 7:26pm
Subject: bk commit into 5.1 tree (jimw:1.2133)
List-Archive: http://lists.mysql.com/commits/2535
Message-Id: <20060213182642.44428A924E@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
5.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.2133 06/02/13 10:26:35 jimw@stripped +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.1-16775
  into  mysql.com:/home/jimw/my/mysql-5.1-clean

  sql/ha_partition.cc
    1.29 06/02/13 10:26:31 jimw@stripped +0 -0
    Auto merged

# 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-5.1-clean/RESYNC

--- 1.28/sql/ha_partition.cc	2006-02-11 17:24:24 -08:00
+++ 1.29/sql/ha_partition.cc	2006-02-13 10:26:31 -08:00
@@ -1937,7 +1937,8 @@
 	name_buffer_ptr+= name_add(name_buffer_ptr,
 				   part_name,
 				   subpart_name);
-	*engine_array= (uchar) ha_legacy_type(part_elem->engine_type);
+        *engine_array= (uchar) ha_legacy_type(subpart_elem->engine_type);
+        DBUG_PRINT("info", ("engine: %u", *engine_array));
 	engine_array++;
       }
     }
@@ -1954,7 +1955,7 @@
     Create and write and close file
     to be used at open, delete_table and rename_table
   */
-  fn_format(file_name, name, "", ".par", MY_APPEND_EXT);
+  fn_format(file_name, name, "", ha_par_ext, MY_APPEND_EXT);
   if ((file= my_create(file_name, CREATE_MODE, O_RDWR | O_TRUNC,
 		       MYF(MY_WME))) >= 0)
   {