bk commit into 5.1 tree (patg:1.2017)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.1 repository of patg. When patg 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.2017 05/12/31 08:45:05 patg@stripped +3 -0
  Merge pgalbraith@stripped:/home/bk/mysql-5.1-new
  into  govinda.site:/home/patg/mysql-build/mysql-5.1-wl2682

  sql/sql_base.cc
    1.291 05/12/31 08:45:00 patg@stripped +0 -0
    Auto merged

  sql/ha_partition.cc
    1.24 05/12/31 08:45:00 patg@stripped +0 -0
    Auto merged

  include/my_sys.h
    1.183 05/12/31 08:45:00 patg@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:	patg
# Host:	govinda.site
# Root:	/home/patg/mysql-build/mysql-5.1-wl2682/RESYNC

--- 1.182/include/my_sys.h	2005-12-28 14:32:24 -08:00
+++ 1.183/include/my_sys.h	2005-12-31 08:45:00 -08:00
@@ -98,6 +98,8 @@
 #define MY_RETURN_REAL_PATH	32	/* return full path for file */
 #define MY_SAFE_PATH		64	/* Return NULL if too long path */
 #define MY_RELATIVE_PATH	128	/* name is relative to 'dir' */
+#define MY_APPEND_EXT           256     /* add 'ext' as additional extension*/
+
 
 	/* My seek flags */
 #define MY_SEEK_SET	0

--- 1.290/sql/sql_base.cc	2005-12-31 00:44:49 -08:00
+++ 1.291/sql/sql_base.cc	2005-12-31 08:45:00 -08:00
@@ -1820,9 +1820,8 @@
     {
       char path[FN_REFLEN];
       enum legacy_db_type not_used;
-      strxnmov(path, FN_REFLEN-1, mysql_data_home, "/", table_list->db, "/",
-               table_list->table_name, reg_ext, NullS);
-      (void) unpack_filename(path, path);
+      build_table_filename(path, sizeof(path) - 1,
+                           table_list->db, table_list->table_name, reg_ext);
       if (mysql_frm_type(thd, path, &not_used) == FRMTYPE_VIEW)
       {
         /*

--- 1.23/sql/ha_partition.cc	2005-12-31 00:44:46 -08:00
+++ 1.24/sql/ha_partition.cc	2005-12-31 08:45:00 -08:00
@@ -426,7 +426,8 @@
   DBUG_ENTER("ha_partition::create");
 
   strmov(t_name, name);
-  *fn_ext(t_name)= 0;
+//  *fn_ext(t_name)= 0;
+  DBUG_ASSERT(*fn_rext((char*)name) == '\0');
   if (del_ren_cre_table(t_name, NULL, table_arg, create_info))
   {
     handler::delete_table(t_name);
@@ -704,7 +705,7 @@
     Create and write and close file
     to be used at open, delete_table and rename_table
   */
-  fn_format(file_name, name, "", ".par", MYF(MY_REPLACE_EXT));
+  fn_format(file_name, name, "", ".par", MY_APPEND_EXT);
   if ((file= my_create(file_name, CREATE_MODE, O_RDWR | O_TRUNC,
 		       MYF(MY_WME))) >= 0)
   {
@@ -829,7 +830,7 @@
 
   if (m_file_buffer)
     DBUG_RETURN(FALSE);
-  fn_format(buff, name, "", ha_par_ext, MYF(0));
+  fn_format(buff, name, "", ha_par_ext, MY_APPEND_EXT);
 
   /* Following could be done with my_stat to read in whole file */
   if ((file= my_open(buff, O_RDONLY | O_SHARE, MYF(0))) < 0)