database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +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

10
mysql-test/r/union.result
View File

@ -2005,3 +2005,13 @@ FOUND_ROWS()
1 1
DROP TABLE t1, t2; DROP TABLE t1, t2;
# End of WL1763 tests # End of WL1763 tests
#
# Bug mdev-6874: crash with UNION ALL in a subquery
#
CREATE TABLE t1 (a int, b int);
INSERT INTO t1 VALUES (1,1), (2,8);
SELECT * FROM t1 t1_1 LEFT JOIN t1 t1_2 ON ( t1_2.b = t1_1.a )
WHERE t1_2.b NOT IN ( SELECT 4 UNION ALL SELECT 5 );
a b a b
1 1 1 1
DROP TABLE t1;

12
mysql-test/t/union.test
View File

@ -1417,3 +1417,15 @@ DROP TABLE t1, t2;
--echo # End of WL1763 tests --echo # End of WL1763 tests
--echo #
--echo # Bug mdev-6874: crash with UNION ALL in a subquery
--echo #
CREATE TABLE t1 (a int, b int);
INSERT INTO t1 VALUES (1,1), (2,8);
SELECT * FROM t1 t1_1 LEFT JOIN t1 t1_2 ON ( t1_2.b = t1_1.a )
WHERE t1_2.b NOT IN ( SELECT 4 UNION ALL SELECT 5 );
DROP TABLE t1;

4
sql/item_subselect.cc
View File

@ -3395,7 +3395,9 @@ bool subselect_union_engine::is_executed() const
bool subselect_union_engine::no_rows() bool subselect_union_engine::no_rows()
{ {
/* Check if we got any rows when reading UNION result from temp. table: */ /* Check if we got any rows when reading UNION result from temp. table: */
return MY_TEST(!unit->fake_select_lex->join->send_records); return MY_TEST(!(unit->fake_select_lex ?
unit->fake_select_lex->join->send_records :
((select_union_direct *) result)->send_records));
} }

5
sql/sql_class.h
View File

@ -4431,11 +4431,13 @@ private:
ha_rows limit; ha_rows limit;
public: public:
/* Number of rows in the union */
ha_rows send_records;
select_union_direct(select_result *result, SELECT_LEX *last_select_lex) select_union_direct(select_result *result, SELECT_LEX *last_select_lex)
:result(result), last_select_lex(last_select_lex), :result(result), last_select_lex(last_select_lex),
done_send_result_set_metadata(false), done_initialize_tables(false), done_send_result_set_metadata(false), done_initialize_tables(false),
limit_found_rows(0) limit_found_rows(0)
{} { send_records= 0; }
bool change_result(select_result *new_result); bool change_result(select_result *new_result);
uint field_count(List<Item> &fields) const uint field_count(List<Item> &fields) const
{ {
@ -4466,6 +4468,7 @@ public:
and for the results of subquery engines and for the results of subquery engines
(select_<something>_subselect). (select_<something>_subselect).
*/ */
send_records= 0;
DBUG_ASSERT(false); /* purecov: inspected */ DBUG_ASSERT(false); /* purecov: inspected */
} }
void set_thd(THD *thd_arg) void set_thd(THD *thd_arg)

1
sql/sql_union.cc
View File

@ -247,6 +247,7 @@ int select_union_direct::send_data(List<Item> &items)
return false; return false;
} }
send_records++;
fill_record(thd, table, table->field, items, true, false); fill_record(thd, table, table->field, items, true, false);
if (thd->is_error()) if (thd->is_error())
return true; /* purecov: inspected */ return true; /* purecov: inspected */