From d92009231d90cc187a89eab78bcf3ef090c5e24f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 26 Mar 2012 12:33:49 +0200 Subject: 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 --- sql/item_func.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/item_func.cc') 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 -- cgit v1.2.1