diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2014-12-06 04:02:30 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2014-12-06 04:02:30 +0300 |
| commit | 1e3f09f1638e2bdec6029f6c98317d17d7ca76d1 (patch) | |
| tree | f1266ae396bcbb1ad3121467f3b7092f70ac2497 /sql/item_subselect.cc | |
| parent | 5ee1c25fa8043f81ad744d1c532b8c1dafa3b5ea (diff) | |
| download | mariadb-git-1e3f09f1638e2bdec6029f6c98317d17d7ca76d1.tar.gz | |
MDEV-7264: Assertion `0' failed in subselect_engine::get_identifier()
Switch EXPLAIN JSON from using subselect_engine::get_identifier()
to the number from Item_subselect::unit.
Remove subselect_union_engine::get_identifier() because it was added
only for EXPLAIN JSON code.
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 1662ba02e0f..32d63628cb5 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -898,10 +898,10 @@ void Item_subselect::print(String *str, enum_query_type query_type) if (query_type == QT_EXPLAIN) { str->append("(subquery#"); - if (engine) + if (unit && unit->first_select()) { char buf[64]; - ll2str(engine->get_identifier(), buf, 10, 0); + ll2str(unit->first_select()->select_number, buf, 10, 0); str->append(buf); } else @@ -3732,10 +3732,6 @@ int subselect_union_engine::exec() return res; } -int subselect_union_engine::get_identifier() -{ - return unit->first_select()->select_number; -} /* Search for at least one row satisfying select condition |