1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 5.5-mwl248 -> 10.0-base

This commit is contained in:
Igor Babaev
2013-01-08 19:34:33 -08:00
54 changed files with 2575 additions and 1676 deletions

View File

@ -7473,10 +7473,10 @@ JOIN_TAB *next_breadth_first_tab(JOIN *join, enum enum_exec_or_opt tabs_kind,
}
JOIN_TAB *first_top_level_tab(JOIN *join, enum enum_with_const_tables with_const)
JOIN_TAB *first_top_level_tab(JOIN *join, enum enum_with_const_tables const_tbls)
{
JOIN_TAB *tab= join->join_tab;
if (with_const == WITH_CONST_TABLES)
if (const_tbls == WITHOUT_CONST_TABLES)
{
if (join->const_tables == join->table_count)
return NULL;