diff options
| -rw-r--r-- | include/mysql.h.pp | 4 | ||||
| -rw-r--r-- | include/mysql_com.h | 5 | ||||
| -rw-r--r-- | mysys/my_addr_resolve.c | 2 | ||||
| -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 |
7 files changed, 8 insertions, 13 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 002b3f2e2ea..ce577146581 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -66,9 +66,7 @@ enum mysql_enum_shutdown_level { SHUTDOWN_WAIT_TRANSACTIONS= (unsigned char)(1 << 1), SHUTDOWN_WAIT_UPDATES= (unsigned char)(1 << 3), SHUTDOWN_WAIT_ALL_BUFFERS= ((unsigned char)(1 << 3) << 1), - SHUTDOWN_WAIT_CRITICAL_BUFFERS= ((unsigned char)(1 << 3) << 1) + 1, - SHUTDOWN_KILL_QUERY= 254, - SHUTDOWN_KILL_CONNECTION= 255 + SHUTDOWN_WAIT_CRITICAL_BUFFERS= ((unsigned char)(1 << 3) << 1) + 1 }; enum enum_cursor_type { diff --git a/include/mysql_com.h b/include/mysql_com.h index b35e8961bbb..0988d20f97f 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -435,10 +435,7 @@ enum mysql_enum_shutdown_level { /* flush InnoDB buffers and other storage engines' buffers*/ SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1), /* don't flush InnoDB buffers, flush other storage engines' buffers*/ - SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1, - /* Now the 2 levels of the KILL command */ - SHUTDOWN_KILL_QUERY= 254, - SHUTDOWN_KILL_CONNECTION= 255 + SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1 }; /* Compatibility */ diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c index f544139142b..e74845c2808 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -140,7 +140,7 @@ int my_addr_resolve(void *ptr, my_addr_loc *loc) char output[1024]; size_t len; - len= snprintf(input, sizeof(input), "0x%p\n", ptr); + len= my_snprintf(input, sizeof(input), "%p\n", ptr); if (write(in[1], input, len) <= 0) return 1; if (read(out[0], output, sizeof(output)) <= 0) 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); } |