diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-08-30 16:14:51 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-08-30 16:14:51 -0700 |
| commit | 2250e9ea261f661cb73c147a28f4d30655d7483d (patch) | |
| tree | 04673b47943fdb137f8fe5bafdb64a24887f8c0f /sql/sql_derived.cc | |
| parent | cb1e44219b9beae92e104cfe5e67aab3073dd8aa (diff) | |
| parent | 4ca7b226c05ae883accec64b1afe6d60daf1b323 (diff) | |
| download | mariadb-git-2250e9ea261f661cb73c147a28f4d30655d7483d.tar.gz | |
Merge 10.2 into 10.2-mdev9864.
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 6297cc6eb84..04a84accccf 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -568,7 +568,11 @@ bool mysql_derived_init(THD *thd, LEX *lex, TABLE_LIST *derived) if (!unit || unit->prepared) DBUG_RETURN(FALSE); - DBUG_RETURN(derived->init_derived(thd, TRUE)); + bool res= derived->init_derived(thd, TRUE); + + derived->updatable= derived->updatable && derived->is_view(); + + DBUG_RETURN(res); } |