Commit 6de8b295 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/psergey/mysql-5.0-oct25-test
parents fdd6daf4 4693b58d

sql/sql_lex.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

sql/table.h

+4 −4
Original line number Diff line number Diff line
@@ -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;

  /*