diff options
| author | marko@hundin.mysql.fi <> | 2004-05-06 09:53:50 +0300 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2004-05-06 09:53:50 +0300 |
| commit | 007e6210d4ef8b493daeeb9a2973faabc4af7d31 (patch) | |
| tree | 56bfed0b0237c81714afc565f6f4682d8eb3c434 /sql/sql_yacc.yy | |
| parent | c150453b429e896f17ef679a3023157c6ebe6b57 (diff) | |
| parent | 6a6fa5b388b5d500bb84c022bda349e9cee1410c (diff) | |
| download | mariadb-git-007e6210d4ef8b493daeeb9a2973faabc4af7d31.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0d499a300db..0693d33c781 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1200,12 +1200,14 @@ key_def: | opt_constraint FOREIGN KEY_SYM opt_ident '(' key_list ')' references { LEX *lex=Lex; - lex->key_list.push_back(new foreign_key($4, lex->col_list, + lex->key_list.push_back(new foreign_key($4 ? $4:$1, lex->col_list, $8, lex->ref_list, lex->fk_delete_opt, lex->fk_update_opt, lex->fk_match_option)); + lex->key_list.push_back(new Key(Key::MULTIPLE, $4 ? $4:$1, + HA_KEY_ALG_UNDEF, lex->col_list)); lex->col_list.empty(); /* Alloced by sql_alloc */ } | constraint opt_check_constraint |