diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 28a380175d6..1403221a8a9 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -510,7 +510,6 @@ void lex_start(THD *thd)
   lex->parse_vcol_expr= FALSE;
   lex->check_exists= FALSE;
   lex->verbose= 0;
-  lex->contains_plaintext_password= false;
 
   lex->name.str= 0;
   lex->name.length= 0;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 5b520980953..9f5b6e258b0 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -2404,7 +2404,6 @@ struct LEX: public Query_tables_list
   bool sp_lex_in_use;	/* Keep track on lex usage in SPs for error handling */
   bool all_privileges;
   bool proxy_priv;
-  bool contains_plaintext_password;
 
   sp_pcontext *spcont;
 
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 674610b4a6a..771ada6e86c 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2141,7 +2141,6 @@ master_def:
         | MASTER_PASSWORD_SYM EQ TEXT_STRING_sys
           {
             Lex->mi.password = $3.str;
-            Lex->contains_plaintext_password= true;
           }
         | MASTER_PORT_SYM EQ ulong_num
           {
@@ -2479,7 +2478,6 @@ server_option:
         | PASSWORD TEXT_STRING_sys
           {
             Lex->server_options.password= $2.str;
-            Lex->contains_plaintext_password= true;
           }
         | SOCKET_SYM TEXT_STRING_sys
           {
@@ -9645,14 +9643,12 @@ function_call_conflict:
         | OLD_PASSWORD '(' expr ')'
           {
             $$=  new (thd->mem_root) Item_func_old_password($3);
-            Lex->contains_plaintext_password= true;
             if ($$ == NULL)
               MYSQL_YYABORT;
           }
         | PASSWORD '(' expr ')'
           {
             Item* i1;
-            Lex->contains_plaintext_password= true;
             if (thd->variables.old_passwords == 1)
               i1= new (thd->mem_root) Item_func_old_password($3);
             else
@@ -14649,7 +14645,6 @@ text_or_password:
             }
             if ($$ == NULL)
               MYSQL_YYABORT;
-            Lex->contains_plaintext_password= true;
           }
         | OLD_PASSWORD '(' TEXT_STRING ')'
           {
@@ -14658,7 +14653,6 @@ text_or_password:
               $3.str;
             if ($$ == NULL)
               MYSQL_YYABORT;
-            Lex->contains_plaintext_password= true;
           }
         ;