database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed bugs causing failures fot the funcs_1 test suite.

Browse Source 
Uncommented the failing test cases.

Commented out the failing test case from parts.partition_repair_myisam.test.
The test case has to be changed to bear the same semantics as before mwl106.
This commit is contained in:
Igor Babaev
2011-06-03 21:44:37 -07:00
parent dd3b27834c
commit 35c35858f8
8 changed files with 108 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_lex.cc
View File

@ -2370,6 +2370,22 @@ bool st_lex::can_be_merged()
/* find non VIEW subqueries/unions */
bool selects_allow_merge= select_lex.next_select() == 0;
if (selects_allow_merge)
{
for (SELECT_LEX_UNIT *tmp_unit= select_lex.first_inner_unit();
tmp_unit;
tmp_unit= tmp_unit->next_unit())
{
if (tmp_unit->first_select()->parent_lex == this &&
(tmp_unit->item == 0 ||
(tmp_unit->item->place() != IN_WHERE &&
tmp_unit->item->place() != IN_ON)))
{
selects_allow_merge= 0;
break;
}
}
}
return (selects_allow_merge &&
select_lex.group_list.elements == 0 &&