10.0-base merge (roles)

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index e27f3cbd4a6..f892f1bf3c7 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -2428,7 +2428,6 @@ struct LEX: public Query_tables_list
     this command.
   */
   bool parse_vcol_expr;
-  bool with_persistent_for_clause; // uses PERSISTENT FOR clause (in ANALYZE)
 
   enum SSL_type ssl_type;			/* defined in violite.h */
   enum enum_duplicates duplicates;
@@ -2437,6 +2436,8 @@ struct LEX: public Query_tables_list
   union {
     enum ha_rkey_function ha_rkey_mode;
     enum xa_option_words xa_opt;
+    bool with_admin_option;                     // GRANT role
+    bool with_persistent_for_clause; // uses PERSISTENT FOR clause (in ANALYZE)
   };
   enum enum_var_type option_type;
   enum enum_view_create_mode create_view_mode;