diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 22:25:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 22:25:38 +0100 |
| commit | 10740939eb824bbd792352f654380e258edd7675 (patch) | |
| tree | a4c68f331f0470b8bd30822de5938a6552f69738 /sql/table.h | |
| parent | a91c59c2affdebb4b34c2c8000b0b1648d43046d (diff) | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| download | mariadb-git-10740939eb824bbd792352f654380e258edd7675.tar.gz | |
5.5 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 60a8578fc0b..dfcee9e75d6 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2170,9 +2170,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() { @@ -2180,9 +2182,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() { |