mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post-merge fixes part #1.

Browse source
This commit is contained in:
Sergey Petrunya 2011-05-26 11:30:14 +04:00
parent 77b3b960b1
commit f0038da8f6
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/t/subselect4.test
View file

@ -666,7 +666,6 @@ INSERT INTO t2 VALUES ('f'),('d');
SET @old_optimizer_switch = @@session.optimizer_switch;
SET SESSION optimizer_switch = 'materialization=on,in_to_exists=off,';
select sin(0);
EXPLAIN
SELECT * FROM t1
WHERE f3 = (

3
sql/sql_select.cc
View file

@ -9114,7 +9114,10 @@ void JOIN_TAB::cleanup()
if (table->pos_in_table_list &&
table->pos_in_table_list->jtbm_subselect)
{
end_read_record(&read_record);
//psergey-merge:
table->pos_in_table_list->jtbm_subselect->cleanup();
return;
}
/*
We need to reset this for next select