diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-04-22 10:14:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2015-04-22 13:59:18 +0200 |
| commit | 8cbaafd22b145512cc91f7b512290320849e77bd (patch) | |
| tree | 883256655c931a6bb940b7d7d67d5d985673d17c /sql/sql_derived.cc | |
| parent | e428c809d7e2176834ed9889483643e4ef2c2c2b (diff) | |
| download | mariadb-git-8cbaafd22b145512cc91f7b512290320849e77bd.tar.gz | |
MDEV-8018: main.multi_update fails with --ps-protocol
save_prep_leaf_tables() made recursive to work with underlying view
Arena restoiring fixed in case of EOM.
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 56748fa110d..c6865a7116e 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -169,7 +169,9 @@ mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases) uint8 allowed_phases= (derived->is_merged_derived() ? DT_PHASES_MERGE : DT_PHASES_MATERIALIZE); DBUG_ENTER("mysql_handle_single_derived"); - DBUG_PRINT("enter", ("phases: 0x%x allowed: 0x%x", phases, allowed_phases)); + DBUG_PRINT("enter", ("phases: 0x%x allowed: 0x%x alias: '%s'", + phases, allowed_phases, + (derived->alias ? derived->alias : "<NULL>"))); if (!lex->derived_tables) DBUG_RETURN(FALSE); |