Commit 797797cd authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents b9e1e904 c8cb3848
...@@ -3514,7 +3514,7 @@ require_list_element: SUBJECT_SYM TEXT_STRING ...@@ -3514,7 +3514,7 @@ require_list_element: SUBJECT_SYM TEXT_STRING
LEX *lex=Lex; LEX *lex=Lex;
if (lex->ssl_cipher) if (lex->ssl_cipher)
{ {
net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "CHIPER"); net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "CIPHER");
YYABORT; YYABORT;
} }
lex->ssl_cipher=$2.str; lex->ssl_cipher=$2.str;
......
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