bk commit into 5.1 tree (tsmith:1.2498)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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-05-01 09:47:14+02:00, tsmith@stripped +2 -0
  Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
  into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
  MERGE: 1.1810.2866.28

  mysql-test/lib/mtr_report.pl@stripped, 2007-05-01 07:28:24+02:00, tsmith@stripped +1 -2
    Auto merged
    MERGE: 1.21.1.17

  sql/sql_table.cc@stripped, 2007-05-01 09:47:02+02:00, tsmith@stripped +14 -25
    Manual merge
    MERGE: 1.239.1.103

# 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:	tsmith
# Host:	quadxeon.mysql.com
# Root:	/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/RESYNC

--- 1.412/sql/sql_table.cc	2007-04-28 01:50:09 +02:00
+++ 1.413/sql/sql_table.cc	2007-05-01 09:47:02 +02:00
@@ -207,19 +207,22 @@ uint build_table_filename(char *buff, si
     path length
 */
 
-uint build_tmptable_filename(THD* thd, char *buff, size_t bufflen)
+static uint build_tmptable_filename(THD* thd, char *buff, size_t bufflen)
 {
-  uint length;
-  char tmp_table_name[tmp_file_prefix_length+22+22+22+3];
   DBUG_ENTER("build_tmptable_filename");
 
-  my_snprintf(tmp_table_name, sizeof(tmp_table_name),
-	      "%s%lx_%lx_%x",
-	      tmp_file_prefix, current_pid,
-	      thd->thread_id, thd->tmp_table++);
+  char *p= strnmov(buff, mysql_tmpdir, bufflen);
+  my_snprintf(buff, bufflen - (p - buff), "%s%lx_%lx_%x%s",
+              tmp_file_prefix, current_pid,
+              thd->thread_id, thd->tmp_table++, reg_ext);
 
-  strxnmov(buff, bufflen, mysql_tmpdir, "/", tmp_table_name, reg_ext, NullS);
-  length= unpack_filename(buff, buff);
+  if (lower_case_table_names)
+  {
+    /* Convert all except tmpdir to lower case */
+    my_casedn_str(files_charset_info, p);
+  }
+
+  uint length= unpack_filename(buff, buff);
   DBUG_PRINT("exit", ("buff: '%s'", buff));
   DBUG_RETURN(length);
 }
@@ -3440,8 +3443,6 @@ bool mysql_create_table_internal(THD *th
   if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
   {
     path_length= build_tmptable_filename(thd, path, sizeof(path));
-    if (lower_case_table_names)
-      my_casedn_str(files_charset_info, path);
     create_info->table_options|=HA_CREATE_DELAY_KEY_WRITE;
   }
   else  
@@ -4751,8 +4752,6 @@ bool mysql_create_like_table(THD* thd, T
     if (find_temporary_table(thd, db, table_name))
       goto table_exists;
     dst_path_length= build_tmptable_filename(thd, dst_path, sizeof(dst_path));
-    if (lower_case_table_names)
-      my_casedn_str(files_charset_info, dst_path);
     create_info->table_options|= HA_CREATE_DELAY_KEY_WRITE;
   }
   else

--- 1.46/mysql-test/lib/mtr_report.pl	2007-04-04 15:41:36 +02:00
+++ 1.47/mysql-test/lib/mtr_report.pl	2007-05-01 07:28:24 +02:00
@@ -238,7 +238,7 @@ sub mtr_report_stats ($) {
   }
   if (!$::opt_extern)
   {
-    print "The servers where restarted $tot_restarts times\n";
+    print "The servers were restarted $tot_restarts times\n";
   }
 
   if ( $::opt_timer )
@@ -358,7 +358,7 @@ sub mtr_report_stats ($) {
 
   if ( $tot_failed != 0 || $found_problems)
   {
-    mtr_error("there where failing test cases");
+    mtr_error("there were failing test cases");
   }
 }