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_class.h | |
| 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_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index b1881db49e9..d44ade1c845 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4431,11 +4431,13 @@ private: ha_rows limit; public: + /* Number of rows in the union */ + ha_rows send_records; select_union_direct(select_result *result, SELECT_LEX *last_select_lex) :result(result), last_select_lex(last_select_lex), done_send_result_set_metadata(false), done_initialize_tables(false), limit_found_rows(0) - {} + { send_records= 0; } bool change_result(select_result *new_result); uint field_count(List<Item> &fields) const { @@ -4466,6 +4468,7 @@ public: and for the results of subquery engines (select_<something>_subselect). */ + send_records= 0; DBUG_ASSERT(false); /* purecov: inspected */ } void set_thd(THD *thd_arg) |