diff options
| author | Igor Babaev <igor@askmonty.org> | 2014-10-17 12:59:28 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2014-10-17 12:59:28 -0700 |
| commit | a4d1783aaeea6a3e4a46084fde161ff7152fd2da (patch) | |
| tree | 53114e3a6cd5a3361cc1a092006e40c1153e004c /sql/sql_union.cc | |
| parent | 3c4bb0e8720b84a14fe4822d1986d01290b9ab44 (diff) | |
| download | mariadb-git-a4d1783aaeea6a3e4a46084fde161ff7152fd2da.tar.gz | |
Fixed bug mdev-6874.
The method subselect_union_engine::no_rows() must take
into account the fact that now unit->fake_select_lex is
NULL for for select_union_direct objects.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index cfc34b0f90a..9b8188b568d 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -246,6 +246,7 @@ int select_union_direct::send_data(List<Item> &items) return false; } + send_records++; fill_record(thd, table, table->field, items, true, false); if (thd->is_error()) return true; /* purecov: inspected */ |