summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2017-07-17 22:34:07 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2017-07-17 22:34:07 +0200
commitb461e34c68709a720ec45825d492dbf690241dc4 (patch)
treeb4c102f440298aaa44a1ad36986a393099284a46 /sql/sql_derived.cc
parent27bc13b7a2f99a6011a5081670b320c685dde443 (diff)
downloadmariadb-git-bb-5.5-MDEV-11240.tar.gz
MDEV-11240: Server crashes in check_view_single_update or Assertion `derived->table' failed in mysql_derived_merge_for_insertbb-5.5-MDEV-11240
Move table pointer for single table view (even if it is view over other view) to make the access universal.
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r--sql/sql_derived.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 20fca2de8cf..493f0eccc8c 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -525,7 +525,9 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived)
derived->schema_table= derived->merge_underlying_list->schema_table;
derived->merged_for_insert= TRUE;
}
- }
+ }
+ else
+ derived->table= derived->merge_underlying_list->table;
DBUG_RETURN(FALSE);
}