diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-06 15:56:38 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-06 15:56:38 +0300 |
| commit | c05fbd4c0be5be8a5bf9900a11cdc95d90bc0813 (patch) | |
| tree | 7cc298f1b88a43a4da02556927f340c392cebfb5 /sql/table.h | |
| parent | 0a04f6b165035ec77e602b66482510d54c28e0bd (diff) | |
| parent | c751fdd9aa9ce8fc30b6a18abc11d4db1a41fc2c (diff) | |
| download | mariadb-git-c05fbd4c0be5be8a5bf9900a11cdc95d90bc0813.tar.gz | |
merge
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index b7cabe21638..4c397ded0cf 100644 --- a/sql/table.h +++ b/sql/table.h @@ -185,6 +185,10 @@ struct st_table { #define VIEW_ALGORITHM_TMPTABLE 1 #define VIEW_ALGORITHM_MERGE 2 +#define VIEW_CHECK_NONE 0 +#define VIEW_CHECK_LOCAL 1 +#define VIEW_CHECK_CASCADED 2 + struct st_lex; typedef struct st_table_list @@ -218,6 +222,7 @@ typedef struct st_table_list /* most upper view this table belongs to */ st_table_list *belong_to_view; Item *where; /* VIEW WHERE clause condition */ + Item *check_option; /* WITH CHECK OPTION condition */ LEX_STRING query; /* text of (CRETE/SELECT) statement */ LEX_STRING md5; /* md5 of query tesxt */ LEX_STRING source; /* source of CREATE VIEW */ @@ -228,6 +233,7 @@ typedef struct st_table_list ulonglong updatable_view; /* VIEW can be updated */ ulonglong revision; /* revision control number */ ulonglong algorithm; /* 0 any, 1 tmp tables , 2 merging */ + ulonglong with_check; /* WITH CHECK OPTION */ uint effective_algorithm; /* which algorithm was really used */ GRANT_INFO grant; thr_lock_type lock_type; @@ -239,6 +245,7 @@ typedef struct st_table_list bool updating; /* for replicate-do/ignore table */ bool force_index; /* prefer index over table scan */ bool ignore_leaves; /* preload only non-leaf nodes */ + bool no_where_clause; /* do not attach WHERE to SELECT */ table_map dep_tables; /* tables the table depends on */ table_map on_expr_dep_tables; /* tables on expression depends on */ struct st_nested_join *nested_join; /* if the element is a nested join */ |