diff options
| author | unknown <sanja@askmonty.org> | 2014-06-02 15:36:06 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2014-06-02 15:36:06 +0300 |
| commit | 0fbe91b45bd2181e4c39b7550081b468ba179457 (patch) | |
| tree | b027e1c58c13a43a9783e4f04590c8daa6d57e56 /sql/table.h | |
| parent | 285160dee270abbbfef9b7c1fb72ec4040c42262 (diff) | |
| download | mariadb-git-0fbe91b45bd2181e4c39b7550081b468ba179457.tar.gz | |
MDEV-6251: SIGSEGV in query optimizer (in set_check_materialized with MERGE view)
mysql_derived_merge() made correctly working with views.
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 95925cb202e..8875ee26afb 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1804,7 +1804,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; |