bk commit into 6.1 tree (dlenev:1.2599)

[dlenev]

Below is the list of changes that have just been committed into a local
6.1 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-03-12 23:52:52+03:00, dlenev@stripped +1 -0
  Fixes after merging patch that changes type of Key_part_spec::field_name
  and Key::name to LEX_STRING into mysql-6.1-fk.

  sql/sql_yacc.yy@stripped, 2008-03-12 23:52:48+03:00, dlenev@stripped +4 -3
    Fixes after merging patch that changes type of Key_part_spec::field_name
    and Key::name to LEX_STRING into mysql-6.1-fk.

diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2008-03-12 22:54:22 +03:00
+++ b/sql/sql_yacc.yy	2008-03-12 23:52:48 +03:00
@@ -4622,7 +4622,8 @@ column_ref_constraint_def:
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             Key *key;
-            lex->col_list.push_back(new (thd->mem_root) Key_part_spec(lex->ident));
+            lex->col_list.push_back(new (thd->mem_root)
+                                        Key_part_spec(lex->ident, 0));
             key= new (thd->mem_root) Foreign_key($1, FALSE, FALSE,
                                                  lex->col_list, $2,
                                                  lex->ref_list,
@@ -5984,7 +5985,7 @@ alter_list_item:
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             Alter_drop *alter_drop=
-              new (thd->mem_root) Alter_drop(Alter_drop::FOREIGN_KEY, $2);
+              new (thd->mem_root) Alter_drop(Alter_drop::FOREIGN_KEY, $2.str);
             lex->alter_info.drop_list.push_back(alter_drop);
             lex->alter_info.flags|= ALTER_FOREIGN_KEY;
           }
@@ -5993,7 +5994,7 @@ alter_list_item:
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
             Alter_drop *alter_drop=
-              new (thd->mem_root) Alter_drop(Alter_drop::FOREIGN_KEY, $4);
+              new (thd->mem_root) Alter_drop(Alter_drop::FOREIGN_KEY, $4.str);
             lex->alter_info.drop_list.push_back(alter_drop);
             lex->alter_info.flags|= ALTER_FOREIGN_KEY;
           }