diff options
| author | unknown <sanja@montyprogram.com> | 2014-03-07 13:57:07 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2014-03-07 13:57:07 +0200 |
| commit | 321ff25f3d419bc1a1fae2390450d1b4db30b64c (patch) | |
| tree | b67582cb1540d4174936149df2f103507bd7a74b /sql/table.h | |
| parent | 1f2ef5740360148961151a71603faae497919aa6 (diff) | |
| download | mariadb-git-321ff25f3d419bc1a1fae2390450d1b4db30b64c.tar.gz | |
MDEV-5740: Assertion `!derived->first_select()->exclude_from_table_unique_test || derived->outer_select()-> exclude_from_table_unique_test' failed on 2nd execution of PS with derived_merge
Do not check tables of executed units.
Debug info about stages of derived tables execution added.
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index c3524ad3adf..30495e4d76f 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1791,9 +1791,11 @@ struct TABLE_LIST } inline void set_merged_derived() { + DBUG_ENTER("set_merged_derived"); derived_type= ((derived_type & DTYPE_MASK) | DTYPE_TABLE | DTYPE_MERGE); set_check_merged(); + DBUG_VOID_RETURN; } inline bool is_materialized_derived() { @@ -1801,9 +1803,11 @@ struct TABLE_LIST } void set_materialized_derived() { + DBUG_ENTER("set_materialized_derived"); derived_type= ((derived_type & DTYPE_MASK) | DTYPE_TABLE | DTYPE_MATERIALIZE); set_check_materialized(); + DBUG_VOID_RETURN; } inline bool is_multitable() { |