diff options
| author | Marc Alff <marc.alff@sun.com> | 2010-02-05 09:56:55 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2010-02-05 09:56:55 -0700 |
| commit | 3630d78e6c5a0d83e0eaff554df833f4e392449f (patch) | |
| tree | 4186fe2f1d42765fe6e7730a35ec37c9c1ece786 /sql/sql_lex.h | |
| parent | 2d75b6c0af81820d5479d24cefd6779f5c084f3b (diff) | |
| parent | a4fc3c7bd77a9bbb57f9d591768f96c5d269626b (diff) | |
| download | mariadb-git-3630d78e6c5a0d83e0eaff554df833f4e392449f.tar.gz | |
Merge mysql-next-mr-marc --> mysql-next-mr-bugfixing
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 923e924dfbc..80cb1e0f210 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1905,7 +1905,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; /* |