Commit 3612707c authored by sergefp@mysql.com's avatar sergefp@mysql.com

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-oct25-test
parents 4ad3313c fd3a3c22
......@@ -804,7 +804,7 @@ typedef struct st_lex
/*
A flag that indicates what kinds of derived tables are present in the
query (0 if no derived tables, otherwise a combination of flags
DERIVED_SUBQUERY and DERIVED_VIEW.
DERIVED_SUBQUERY and DERIVED_VIEW).
*/
uint8 derived_tables;
uint8 create_view_algorithm;
......
......@@ -550,13 +550,13 @@ typedef struct st_table_list
*/
st_table_list *referencing_view;
/*
security context (non-zero only for tables which belong
to view with SQL SEQURITY DEFINER)
Security context (non-zero only for tables which belong
to view with SQL SECURITY DEFINER)
*/
Security_context *security_ctx;
/*
this view security context (non-zero only for views with
SQL SEQURITY DEFINER)
This view security context (non-zero only for views with
SQL SECURITY DEFINER)
*/
Security_context *view_sctx;
/*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment