diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-02 21:52:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-02 21:52:46 +0200 |
| commit | 51e4650ed0644ed88cf5d542bd0cab50e7ea0343 (patch) | |
| tree | aaf73f6a77c6c1ad03473f4d664356b6f60169c9 /sql/table.h | |
| parent | eef2bc5a5c30eef43eee035e23b87286a8dd50bd (diff) | |
| parent | 20fab71b144f85be9e2ccc145d24d257b0e9df7e (diff) | |
| download | mariadb-git-51e4650ed0644ed88cf5d542bd0cab50e7ea0343.tar.gz | |
Merge 5.5 into 10.0
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 0c5e00cc34d..69a954e73d3 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2206,6 +2206,9 @@ struct TABLE_LIST inline void set_merged_derived() { DBUG_ENTER("set_merged_derived"); + DBUG_PRINT("enter", ("Alias: '%s' Unit: %p", + (alias ? alias : "<NULL>"), + get_unit())); derived_type= ((derived_type & DTYPE_MASK) | DTYPE_TABLE | DTYPE_MERGE); set_check_merged(); @@ -2218,6 +2221,9 @@ struct TABLE_LIST void set_materialized_derived() { DBUG_ENTER("set_materialized_derived"); + DBUG_PRINT("enter", ("Alias: '%s' Unit: %p", + (alias ? alias : "<NULL>"), + get_unit())); derived_type= ((derived_type & (derived ? DTYPE_MASK : DTYPE_VIEW)) | DTYPE_TABLE | DTYPE_MATERIALIZE); set_check_materialized(); |