bk commit into 5.1 tree (holyfoot:1.2551)

[holyfoot]

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@stripped, 2007-06-07 09:40:42+05:00, holyfoot@hfmain.(none) +1 -0
  Merge bk@stripped:mysql-5.1-opt
  into  mysql.com:/home/hf/work/28309/my51-28309
  MERGE: 1.2511.10.1

  sql/handler.cc@stripped, 2007-06-07 09:40:38+05:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.307.3.1

# 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:	hfmain.(none)
# Root:	/home/hf/work/28309/my51-28309/RESYNC

--- 1.310/sql/handler.cc	2007-06-07 09:40:47 +05:00
+++ 1.311/sql/handler.cc	2007-06-07 09:40:47 +05:00
@@ -1392,6 +1392,26 @@ bool ha_flush_logs(handlerton *db_type)
   return FALSE;
 }
 
+static const char *check_lowercase_names(handler *file, const char *path,
+                                         char *tmp_path)
+{
+  if (lower_case_table_names != 2 || (file->ha_table_flags() & HA_FILE_BASED))
+    return path;
+
+  /* Ensure that table handler get path in lower case */
+  if (tmp_path != path)
+    strmov(tmp_path, path);
+
+  /*
+    we only should turn into lowercase database/table part
+    so start the process after homedirectory
+  */
+  my_casedn_str(files_charset_info,
+      tmp_path + strlen(mysql_data_home) + strlen(FN_ROOTDIR));
+  return tmp_path;
+}
+
+
 /** @brief
   This should return ENOENT if the file doesn't exists.
   The .frm file will be deleted only if we return 0 or ENOENT
@@ -1415,13 +1435,7 @@ int ha_delete_table(THD *thd, handlerton
       ! (file=get_new_handler((TABLE_SHARE*)0, thd->mem_root, table_type)))
     DBUG_RETURN(ENOENT);
 
-  if (lower_case_table_names == 2 && !(file->ha_table_flags() &
HA_FILE_BASED))
-  {
-    /* Ensure that table handler get path in lower case */
-    strmov(tmp_path, path);
-    my_casedn_str(files_charset_info, tmp_path);
-    path= tmp_path;
-  }
+  path= check_lowercase_names(file, path, tmp_path);
   if ((error= file->delete_table(path)) && generate_warning)
   {
     /*
@@ -2598,15 +2612,7 @@ int ha_create_table(THD *thd, const char
   if (update_create_info)
     update_create_info_from_table(create_info, &table);
 
-  name= share.path.str;
-  if (lower_case_table_names == 2 &&
-      !(table.file->ha_table_flags() & HA_FILE_BASED))
-  {
-    /* Ensure that handler gets name in lower case */
-    strmov(name_buff, name);
-    my_casedn_str(files_charset_info, name_buff);
-    name= name_buff;
-  }
+  name= check_lowercase_names(table.file, share.path.str, name_buff);
 
   error= table.file->create(name, &table, create_info);
   VOID(closefrm(&table, 0));
@@ -2656,7 +2662,8 @@ int ha_create_table_from_engine(THD* thd
     frmblob and frmlen are set, write the frm to disk
   */
 
-  (void)strxnmov(path,FN_REFLEN-1,mysql_data_home,"/",db,"/",name,NullS);
+  (void)strxnmov(path,FN_REFLEN-1,mysql_data_home,FN_ROOTDIR,
+                 db,FN_ROOTDIR,name,NullS);
   // Save the frm file
   error= writefrm(path, frmblob, frmlen);
   my_free(frmblob, MYF(0));
@@ -2677,12 +2684,7 @@ int ha_create_table_from_engine(THD* thd
   update_create_info_from_table(&create_info, &table);
   create_info.table_options|= HA_OPTION_CREATE_FROM_ENGINE;
 
-  if (lower_case_table_names == 2 &&
-      !(table.file->ha_table_flags() & HA_FILE_BASED))
-  {
-    /* Ensure that handler gets name in lower case */
-    my_casedn_str(files_charset_info, path);
-  }
+  check_lowercase_names(table.file, path, path);
   error=table.file->create(path,&table,&create_info);
   VOID(closefrm(&table, 1));