diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-15 18:08:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-15 18:08:08 +0100 |
| commit | 25609313ffbd9205e921d0793cf423f711d10ced (patch) | |
| tree | f04a1c26fabcc5463aca51a860f03131e02d94f7 /sql/table.h | |
| parent | 47a54a2e087a7c1fc861bcbc114c14987f492cfe (diff) | |
| parent | 764eeeee74f999fe2107fc362236563be0025093 (diff) | |
| download | mariadb-git-25609313ffbd9205e921d0793cf423f711d10ced.tar.gz | |
5.3.4 merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sql/table.h b/sql/table.h index a327d625387..77a7f8cf6a9 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1983,16 +1983,18 @@ struct TABLE_LIST inline void set_merged_derived() { derived_type= ((derived_type & DTYPE_MASK) | - DTYPE_TABLE | DTYPE_MERGE); + DTYPE_TABLE | DTYPE_MERGE); + set_check_merged(); } inline bool is_materialized_derived() { return (derived_type & DTYPE_MATERIALIZE); } - inline void set_materialized_derived() + void set_materialized_derived() { derived_type= ((derived_type & DTYPE_MASK) | - DTYPE_TABLE | DTYPE_MATERIALIZE); + DTYPE_TABLE | DTYPE_MATERIALIZE); + set_check_materialized(); } inline bool is_multitable() { @@ -2033,9 +2035,17 @@ struct TABLE_LIST int fetch_number_of_rows(); bool change_refs_to_fields(); + bool single_table_updatable(); + private: bool prep_check_option(THD *thd, uint8 check_opt_type); bool prep_where(THD *thd, Item **conds, bool no_where_clause); + void set_check_materialized(); +#ifndef DBUG_OFF + void set_check_merged(); +#else + inline void set_check_merged() {} +#endif /** See comments for set_metadata_id() */ enum enum_table_ref_type m_table_ref_type; /** See comments for set_metadata_id() */ |