diff options
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 6c3ad9c6924..0cb9be44636 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -4200,15 +4200,6 @@ Prepared_statement::execute_loop(String *expanded_query, if (set_parameters(expanded_query, packet, packet_end)) return TRUE; -#ifdef NOT_YET_FROM_MYSQL_5_6 - if (unlikely(thd->security_ctx->password_expired && - !lex->is_change_password)) - { - my_error(ER_MUST_CHANGE_PASSWORD, MYF(0)); - return true; - } -#endif - reexecute: // Make sure that reprepare() did not create any new Items. DBUG_ASSERT(thd->free_list == NULL); @@ -4349,16 +4340,6 @@ Prepared_statement::execute_bulk_loop(String *expanded_query, } read_types= FALSE; -#ifdef NOT_YET_FROM_MYSQL_5_6 - if (unlikely(thd->security_ctx->password_expired && - !lex->is_change_password)) - { - my_error(ER_MUST_CHANGE_PASSWORD, MYF(0)); - thd->set_bulk_execution(0); - return true; - } -#endif - // iterations changed by set_bulk_parameters while ((iterations || start_param) && !error && !thd->is_error()) { |