bk commit into 6.0 tree (dlenev:1.2619) WL#148

[dlenev]

Below is the list of changes that have just been committed into a local
6.0 repository of dlenev.  When dlenev 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, 2008-04-05 22:32:43+04:00, dlenev@stripped +1 -0
  Additional fix for patch that has changed type of Key_part_spec::field_name
  and Key::name to LEX_STRING. (The latter was a prerequisite patch for the
  2nd milestone of WL#148 "Foreign keys").
  
  In the main patch I've missed one of the places which should have been
  updated to use Key::name.str instead of Key::name. As result we were
  getting garbage as key name in one of error messages in create.test
  on Win64 and Sparc. This additional change fixes this omission.

  sql/sql_table.cc@stripped, 2008-04-05 22:32:40+04:00, dlenev@stripped +1 -1
    Key::name is now LEX_STRING. We should take this in account when we want
    to print name of key in the error message.

diff -Nrup a/sql/sql_table.cc b/sql/sql_table.cc
--- a/sql/sql_table.cc	2008-03-28 15:00:43 +03:00
+++ b/sql/sql_table.cc	2008-04-05 22:32:40 +04:00
@@ -6152,7 +6152,7 @@ mysql_prepare_alter_table(THD *thd, TABL
       if (key->name.str &&
 	  !my_strcasecmp(system_charset_info, key->name.str, primary_key_name))
       {
-	my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0), key->name);
+	my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0), key->name.str);
         goto err;
       }
     }