Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-oct25-test
This commit is contained in:
commit
6de8b295a7
@ -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;
|
||||
/*
|
||||
|
Loading…
x
Reference in New Issue
Block a user