diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-26 12:33:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-26 12:33:49 +0200 |
| commit | d92009231d90cc187a89eab78bcf3ef090c5e24f (patch) | |
| tree | 31eff0c98bd6e65c4c2c7ce3e0ebc1d950a8969c /sql | |
| parent | 485e7264a97683ca3b560d21dec6829fe284fc1d (diff) | |
| download | mariadb-git-d92009231d90cc187a89eab78bcf3ef090c5e24f.tar.gz | |
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
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 2 | ||||
| -rw-r--r-- | sql/item_subselect.cc | 2 | ||||
| -rw-r--r-- | sql/opt_subselect.cc | 4 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 92431a552c4..9b2e8e5e614 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -6733,7 +6733,7 @@ Item_func_sp::fix_fields(THD *thd, Item **ref) if (res) DBUG_RETURN(res); - if (thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW) + if (thd->lex->is_view_context_analysis()) { /* Here we check privileges of the stored routine only during view diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index d5f85e7ff5d..bfd74767669 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -2508,7 +2508,7 @@ bool Item_in_subselect::fix_fields(THD *thd_arg, Item **ref) } } - if ((thd_arg->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW) && + if (thd_arg->lex->is_view_context_analysis() && left_expr && !left_expr->fixed && left_expr->fix_fields(thd_arg, &left_expr)) return TRUE; diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 8656ca605ab..fe9b8da3a24 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -346,8 +346,8 @@ int check_and_do_in_subquery_rewrites(JOIN *join) TODO: for PS, make the whole block execute only on the first execution */ Item_subselect *subselect; - if (!(thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW) && // (1) - (subselect= parent_unit->item)) // (2) + if (!thd->lex->is_view_context_analysis() && // (1) + (subselect= parent_unit->item)) // (2) { Item_in_subselect *in_subs= NULL; Item_allany_subselect *allany_subs= NULL; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a26f4b47340..bcbdb8332e6 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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); } |