diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-08-03 16:54:06 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-08-03 16:54:06 +0200 |
| commit | 6017f911e33c3a44e6b7b090215446300c38b7be (patch) | |
| tree | 2e0b33c7cd3f1083dce485137fd952b52a37dfbd /sql/table.h | |
| parent | 6e5d9284ed35fbf8dbe1af01e45923c3109aa7ad (diff) | |
| parent | 3c8150b79bf5302879897e0d1ebd594798bb419e (diff) | |
| download | mariadb-git-6017f911e33c3a44e6b7b090215446300c38b7be.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
client/mysql.cc:
Auto merged
mysql-test/r/im_life_cycle.result:
Auto merged
mysql-test/t/im_life_cycle.imtest:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 41ab7e7bec8..5136ac2c4db 100644 --- a/sql/table.h +++ b/sql/table.h @@ -360,6 +360,10 @@ typedef struct st_schema_table #define VIEW_ALGORITHM_TMPTABLE 1 #define VIEW_ALGORITHM_MERGE 2 +#define VIEW_SUID_INVOKER 0 +#define VIEW_SUID_DEFINER 1 +#define VIEW_SUID_DEFAULT 2 + /* view WITH CHECK OPTION parameter options */ #define VIEW_CHECK_NONE 0 #define VIEW_CHECK_LOCAL 1 @@ -678,6 +682,10 @@ typedef struct st_table_list private: bool prep_check_option(THD *thd, uint8 check_opt_type); bool prep_where(THD *thd, Item **conds, bool no_where_clause); + /* + Cleanup for re-execution in a prepared statement or a stored + procedure. + */ } TABLE_LIST; class Item; |