diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-06 22:45:19 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-06 22:45:19 +0200 |
| commit | 31081593aabb116b6d8f86b6c7e76126edb392b4 (patch) | |
| tree | 767a069f255359b5ea37e7c491dfeacf6e519fad /sql/sql_lex.h | |
| parent | b0026e33af8fc3b25a42099c096a84591fd550e2 (diff) | |
| parent | 3a4242fd57b3a2235d2478ed080941b67a82ad1b (diff) | |
| download | mariadb-git-31081593aabb116b6d8f86b6c7e76126edb392b4.tar.gz | |
Merge branch '11.0' into 10.1
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 3b47b1d25c9..05e31c28277 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -2592,8 +2592,8 @@ public: uint profile_options; uint grant, grant_tot_col, which_columns; 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; + enum_fk_option fk_update_opt; + enum_fk_option fk_delete_opt; uint slave_thd_opt, start_transaction_opt; int nest_level; /* |