diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-15 18:08:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-15 18:08:08 +0100 |
| commit | 25609313ffbd9205e921d0793cf423f711d10ced (patch) | |
| tree | f04a1c26fabcc5463aca51a860f03131e02d94f7 /sql/sql_derived.cc | |
| parent | 47a54a2e087a7c1fc861bcbc114c14987f492cfe (diff) | |
| parent | 764eeeee74f999fe2107fc362236563be0025093 (diff) | |
| download | mariadb-git-25609313ffbd9205e921d0793cf423f711d10ced.tar.gz | |
5.3.4 merge
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 63c5bb30474..9f06c99c472 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -483,7 +483,7 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived) return mysql_derived_prepare(thd, lex, derived); if (!derived->is_multitable()) { - if (!derived->updatable) + if (!derived->single_table_updatable()) return derived->create_field_translation(thd); if (derived->merge_underlying_list) { |