diff options
| author | Igor Babaev <igor@askmonty.org> | 2014-10-17 14:06:54 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2014-10-17 14:06:54 -0700 |
| commit | ec89abfef4d0ceef06e4037e8fa1a3cdad7ca18d (patch) | |
| tree | 6c917245aab4070607e0bca9f48f8ab07b7c0d3e /sql/sql_union.cc | |
| parent | aa0fd5ca53b381094c03fce4808032c98d0fe0f4 (diff) | |
| parent | a4d1783aaeea6a3e4a46084fde161ff7152fd2da (diff) | |
| download | mariadb-git-ec89abfef4d0ceef06e4037e8fa1a3cdad7ca18d.tar.gz | |
Merge branch '10.1' of ../10.1-mdev334 into 10.1
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 f4d6bec1353..45d27116c36 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -247,6 +247,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 */ |