diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-06-06 00:07:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-06-06 00:07:27 +0200 |
| commit | e27c338634739ef56a6888e7948e04c0fa0ba677 (patch) | |
| tree | ad63ccae614f3dd77509825d1905fd815ef322cb /sql/table.h | |
| parent | 2a5905141a3c509a7c34c3d370fb146dbc1c965f (diff) | |
| parent | 6d75570e99fbf070cdbeefdfbcfc94d1c7b3ad1f (diff) | |
| download | mariadb-git-e27c338634739ef56a6888e7948e04c0fa0ba677.tar.gz | |
5.5.38 merge
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index 86e03cdaaf5..3ac75ec06e1 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2190,7 +2190,7 @@ struct TABLE_LIST void set_materialized_derived() { DBUG_ENTER("set_materialized_derived"); - derived_type= ((derived_type & DTYPE_MASK) | + derived_type= ((derived_type & (derived ? DTYPE_MASK : DTYPE_VIEW)) | DTYPE_TABLE | DTYPE_MATERIALIZE); set_check_materialized(); DBUG_VOID_RETURN; |