mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
a couple of minor post-5.5-merge cleanups
include/mysql_com.h: remove "shutdown levels" that aren't shutdown levels from mysql_enum_shutdown_level mysys/my_addr_resolve.c: my_snprintf in 5.5 (but not in 5.3) supports %p sql/item_func.cc: use a method (that exists only in 5.5) instead of directly accessing a member sql/item_subselect.cc: use a method (that exists only in 5.5) instead of directly accessing a member sql/opt_subselect.cc: use a method (that exists only in 5.5) instead of directly accessing a member sql/sql_select.cc: use a method (that exists only in 5.5) instead of directly accessing a member
This commit is contained in:
@@ -643,7 +643,7 @@ JOIN::prepare(Item ***rref_pointer_array,
|
||||
*/
|
||||
if (select_lex->master_unit()->item && // 1)
|
||||
select_lex->first_cond_optimization && // 2)
|
||||
!(thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW)) // 3)
|
||||
!thd->lex->is_view_context_analysis()) // 3)
|
||||
{
|
||||
remove_redundant_subquery_clauses(select_lex);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user