1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge 5.3->5.5.

This commit is contained in:
Igor Babaev
2013-03-28 19:18:36 -07:00
3 changed files with 498 additions and 4 deletions

View File

@@ -12853,9 +12853,6 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top,
table->prep_on_expr= table->on_expr= 0;
}
}
if (!top)
continue;
/*
Only inner tables of non-convertible outer joins