diff options
| author | Marc Alff <marc.alff@sun.com> | 2010-01-25 04:55:31 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2010-01-25 04:55:31 -0700 |
| commit | 0d6a21807435991d2177d515ac92fecc72e86e97 (patch) | |
| tree | 4891a774cc8dc214f521a9054c31a63a630f5867 /sql/sql_lex.h | |
| parent | 372611d7b5aab43a8e5304cbfe365ce8de72705f (diff) | |
| download | mariadb-git-0d6a21807435991d2177d515ac92fecc72e86e97.tar.gz | |
Bug#34455 Ambiguous foreign keys syntax is accepted
Backport from 6.0 to 5.5
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 800a16cf2b6..7eb72bc5358 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1903,7 +1903,9 @@ struct LEX: public Query_tables_list uint profile_options; uint uint_geom_type; uint grant, grant_tot_col, which_columns; - uint fk_delete_opt, fk_update_opt, fk_match_option; + enum Foreign_key::fk_match_opt fk_match_option; + enum Foreign_key::fk_option fk_update_opt; + enum Foreign_key::fk_option fk_delete_opt; uint slave_thd_opt, start_transaction_opt; int nest_level; /* |