bk commit into 5.1 tree (gluh:1.2387)

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh 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-01-12 14:47:11+04:00, gluh@eagle.(none) +2 -0
  Merge mysql.com:/home/gluh/MySQL/Merge/5.1
  into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
  MERGE: 1.2378.1.6

  sql/mysqld.cc@stripped, 2007-01-12 14:47:08+04:00, gluh@eagle.(none) +0 -0
    Auto merged
    MERGE: 1.603.1.1

  storage/innobase/handler/ha_innodb.cc@stripped, 2007-01-12 14:47:08+04:00,
gluh@eagle.(none) +0 -0
    Auto merged
    MERGE: 1.317.1.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:	gluh
# Host:	eagle.(none)
# Root:	/home/gluh/MySQL/Merge/5.1-opt/RESYNC

--- 1.606/sql/mysqld.cc	2007-01-12 02:05:07 +04:00
+++ 1.607/sql/mysqld.cc	2007-01-12 14:47:08 +04:00
@@ -3641,7 +3641,7 @@ we force server id to 2, but this MySQL 
   error_handler_hook= my_message_sql;
   start_signal_handler();				// Creates pidfile
 
-  if (acl_init(opt_noacl) ||
+  if (mysql_rm_tmp_tables() || acl_init(opt_noacl) ||
       my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
   {
     abort_loop=1;

--- 1.318/storage/innobase/handler/ha_innodb.cc	2007-01-05 06:51:29 +04:00
+++ 1.319/storage/innobase/handler/ha_innodb.cc	2007-01-12 14:47:08 +04:00
@@ -5912,6 +5912,9 @@ ha_innobase::get_foreign_key_list(THD *t
 	  uint i;
 	  FOREIGN_KEY_INFO f_key_info;
 	  LEX_STRING *name= 0;
+          uint ulen;
+          char uname[NAME_LEN*3+1];           /* Unencoded name */
+          char db_name[NAME_LEN*3+1];
 	  const char *tmp_buff;
 
 	  tmp_buff= foreign->id;
@@ -5922,14 +5925,23 @@ ha_innobase::get_foreign_key_list(THD *t
 	  f_key_info.forein_id= make_lex_string(thd, 0, tmp_buff,
 		  (uint) strlen(tmp_buff), 1);
 	  tmp_buff= foreign->referenced_table_name;
+
+          /* Database name */
 	  i= 0;
 	  while (tmp_buff[i] != '/')
-		  i++;
-	  f_key_info.referenced_db= make_lex_string(thd, 0,
-		  tmp_buff, i, 1);
+          {
+            db_name[i]= tmp_buff[i];
+            i++;
+          }
+          db_name[i]= 0;
+          ulen= filename_to_tablename(db_name, uname, sizeof(uname));
+          f_key_info.referenced_db= make_lex_string(thd, 0, uname, ulen, 1);
+
+          /* Table name */
 	  tmp_buff+= i + 1;
-	  f_key_info.referenced_table= make_lex_string(thd, 0, tmp_buff,
-		  (uint) strlen(tmp_buff), 1);
+          ulen= filename_to_tablename(tmp_buff, uname, sizeof(uname));
+          f_key_info.referenced_table= make_lex_string(thd, 0, uname,
+                                                       ulen, 1);
 
 	  for (i= 0;;) {
 		  tmp_buff= foreign->foreign_col_names[i];