Commit 8b5938a1 authored by Sergei Golubchik's avatar Sergei Golubchik

remove unused LEX::contains_plaintext_password

parent 27c9ed11
...@@ -510,7 +510,6 @@ void lex_start(THD *thd) ...@@ -510,7 +510,6 @@ void lex_start(THD *thd)
lex->parse_vcol_expr= FALSE; lex->parse_vcol_expr= FALSE;
lex->check_exists= FALSE; lex->check_exists= FALSE;
lex->verbose= 0; lex->verbose= 0;
lex->contains_plaintext_password= false;
lex->name.str= 0; lex->name.str= 0;
lex->name.length= 0; lex->name.length= 0;
......
...@@ -2404,7 +2404,6 @@ struct LEX: public Query_tables_list ...@@ -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 sp_lex_in_use; /* Keep track on lex usage in SPs for error handling */
bool all_privileges; bool all_privileges;
bool proxy_priv; bool proxy_priv;
bool contains_plaintext_password;
sp_pcontext *spcont; sp_pcontext *spcont;
......
...@@ -2141,7 +2141,6 @@ master_def: ...@@ -2141,7 +2141,6 @@ master_def:
| MASTER_PASSWORD_SYM EQ TEXT_STRING_sys | MASTER_PASSWORD_SYM EQ TEXT_STRING_sys
{ {
Lex->mi.password = $3.str; Lex->mi.password = $3.str;
Lex->contains_plaintext_password= true;
} }
| MASTER_PORT_SYM EQ ulong_num | MASTER_PORT_SYM EQ ulong_num
{ {
...@@ -2479,7 +2478,6 @@ server_option: ...@@ -2479,7 +2478,6 @@ server_option:
| PASSWORD TEXT_STRING_sys | PASSWORD TEXT_STRING_sys
{ {
Lex->server_options.password= $2.str; Lex->server_options.password= $2.str;
Lex->contains_plaintext_password= true;
} }
| SOCKET_SYM TEXT_STRING_sys | SOCKET_SYM TEXT_STRING_sys
{ {
...@@ -9645,14 +9643,12 @@ function_call_conflict: ...@@ -9645,14 +9643,12 @@ function_call_conflict:
| OLD_PASSWORD '(' expr ')' | OLD_PASSWORD '(' expr ')'
{ {
$$= new (thd->mem_root) Item_func_old_password($3); $$= new (thd->mem_root) Item_func_old_password($3);
Lex->contains_plaintext_password= true;
if ($$ == NULL) if ($$ == NULL)
MYSQL_YYABORT; MYSQL_YYABORT;
} }
| PASSWORD '(' expr ')' | PASSWORD '(' expr ')'
{ {
Item* i1; Item* i1;
Lex->contains_plaintext_password= true;
if (thd->variables.old_passwords == 1) if (thd->variables.old_passwords == 1)
i1= new (thd->mem_root) Item_func_old_password($3); i1= new (thd->mem_root) Item_func_old_password($3);
else else
...@@ -14649,7 +14645,6 @@ text_or_password: ...@@ -14649,7 +14645,6 @@ text_or_password:
} }
if ($$ == NULL) if ($$ == NULL)
MYSQL_YYABORT; MYSQL_YYABORT;
Lex->contains_plaintext_password= true;
} }
| OLD_PASSWORD '(' TEXT_STRING ')' | OLD_PASSWORD '(' TEXT_STRING ')'
{ {
...@@ -14658,7 +14653,6 @@ text_or_password: ...@@ -14658,7 +14653,6 @@ text_or_password:
$3.str; $3.str;
if ($$ == NULL) if ($$ == NULL)
MYSQL_YYABORT; MYSQL_YYABORT;
Lex->contains_plaintext_password= true;
} }
; ;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment