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

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

parents b9e1e904 c8cb3848

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -3514,7 +3514,7 @@ require_list_element: SUBJECT_SYM TEXT_STRING 
   LEX *lex=Lex;

   if (lex->ssl_cipher)

   {

     net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "CHIPER");

     net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "CIPHER");

     YYABORT;

   }

   lex->ssl_cipher=$2.str;