database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

Merge branch '10.1' of ../10.1-mdev334 into 10.1

Browse Source
This commit is contained in:
Igor Babaev
2014-10-17 14:06:54 -07:00
parent aa0fd5ca53 a4d1783aae
commit ec89abfef4
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -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)