diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 19:21:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 19:21:37 +0100 |
| commit | 5d8c15228e38330c2befff7f8fb1b66947dcc70d (patch) | |
| tree | c0ddd5a0ba88560c63bc20aa3707fff2580e8fac /sql/table.h | |
| parent | 9e135ce19fccea9c6c981b2de521b2ae750e26e5 (diff) | |
| parent | cfc83cf9d3c3354d47f9e7ee903ea279f60cce58 (diff) | |
| download | mariadb-git-5d8c15228e38330c2befff7f8fb1b66947dcc70d.tar.gz | |
5.3-merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 83b2a7a99a9..94b1cf1eff4 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2083,9 +2083,11 @@ struct TABLE_LIST } inline void set_merged_derived() { + DBUG_ENTER("set_merged_derived"); derived_type= ((derived_type & DTYPE_MASK) | DTYPE_TABLE | DTYPE_MERGE); set_check_merged(); + DBUG_VOID_RETURN; } inline bool is_materialized_derived() { @@ -2093,9 +2095,11 @@ struct TABLE_LIST } void set_materialized_derived() { + DBUG_ENTER("set_materialized_derived"); derived_type= ((derived_type & DTYPE_MASK) | DTYPE_TABLE | DTYPE_MATERIALIZE); set_check_materialized(); + DBUG_VOID_RETURN; } inline bool is_multitable() { |