Cleanup after last merge

client/mysqltest.c:
  Don't write error message to log if there is more than one possible error message
include/mysqld_error.h:
  Made error messages more general
libmysqld/Makefile.am:
  md5 is now in mysys
mysql-test/include/have_isam.inc:
  Update to new result format
mysql-test/include/not_embedded.inc:
  Update to new result format
mysql-test/mysql-test-run.sh:
  Update to new result format
mysql-test/r/auto_increment.result:
  Update to new result format
mysql-test/r/count_distinct2.result:
  Update to new result format
mysql-test/r/create.result:
  Update to new result format
mysql-test/r/func_system.result:
  Update to new result format
mysql-test/r/isam.result:
  Update to new result format
mysql-test/r/lock.result:
  Update to new result format
mysql-test/r/lock_multi.result:
  Update to new result format
mysql-test/r/rename.result:
  Update to new result format
mysql-test/r/rpl000001.result:
  Fix wrong test
mysql-test/r/tablelock.result:
  Update to new result format
mysql-test/t/rename.test:
  Update to new result format
sql/share/czech/errmsg.txt:
  Made error messages more general
sql/share/danish/errmsg.txt:
  Made error messages more general
sql/share/dutch/errmsg.txt:
  Made error messages more general
sql/share/english/errmsg.txt:
  Made error messages more general
sql/share/estonian/errmsg.txt:
  Made error messages more general
sql/share/french/errmsg.txt:
  Made error messages more general
sql/share/german/errmsg.txt:
  Made error messages more general
sql/share/greek/errmsg.txt:
  Made error messages more general
sql/share/hungarian/errmsg.txt:
  Made error messages more general
sql/share/italian/errmsg.txt:
  Made error messages more general
sql/share/japanese/errmsg.txt:
  Made error messages more general
sql/share/korean/errmsg.txt:
  Made error messages more general
sql/share/norwegian-ny/errmsg.txt:
  Made error messages more general
sql/share/norwegian/errmsg.txt:
  Made error messages more general
sql/share/polish/errmsg.txt:
  Made error messages more general
sql/share/portuguese/errmsg.txt:
  Made error messages more general
sql/share/romanian/errmsg.txt:
  Made error messages more general
sql/share/russian/errmsg.txt:
  Made error messages more general
sql/share/slovak/errmsg.txt:
  Made error messages more general
sql/share/spanish/errmsg.txt:
  Made error messages more general
sql/share/swedish/errmsg.txt:
  Made error messages more general
sql/share/ukrainian/errmsg.txt:
  Made error messages more general
sql/sql_lex.cc:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_lex.h:
  We can't remove lex->thd because sql_yacc uses it.
sql/sql_yacc.yy:
  Cleanup
support-files/mysql.spec.sh:
  Create MySQL-embedded rpm
tools/mysqlmanager.c:
  Fix bug in merge

1 files changed, 21 insertions, 15 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 87abc4b3402..8a4c219adb0 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3150,8 +3150,8 @@ set_isolation:
         }
 	| SESSION_SYM tx_isolation
 	{
-	 LEX *lex=Lex;
-	 lex->thd->session_tx_isolation= lex->tx_isolation= $2;
+	  LEX *lex=Lex;
+	  lex->thd->session_tx_isolation= lex->tx_isolation= $2;
 	}
 	| tx_isolation
 	{ Lex->tx_isolation= $1; }
@@ -3315,27 +3315,33 @@ require_list: require_list_element AND require_list
 
 require_list_element: SUBJECT_SYM TEXT_STRING
  {
-   if (Lex->x509_subject) {
-     send_error(&Lex->thd->net,ER_GRANT_DUPL_SUBJECT);
+   LEX *lex=Lex;
+   if (lex->x509_subject)
+   {
+     net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "SUBJECT");
      YYABORT;
-   } else 
-   Lex->x509_subject=$2.str;
+   }
+   lex->x509_subject=$2.str;
  }
  | ISSUER_SYM TEXT_STRING
  {
-   if (Lex->x509_issuer) {
-     send_error(&Lex->thd->net,ER_GRANT_DUPL_ISSUER);
+   LEX *lex=Lex;
+   if (lex->x509_issuer)
+   {
+     net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "ISSUER");
      YYABORT;
-   } else 
-     Lex->x509_issuer=$2.str;
+   }
+   lex->x509_issuer=$2.str;
  }
  | CIPHER_SYM TEXT_STRING
  {
-   if (Lex->ssl_cipher) {
-     send_error(&Lex->thd->net,ER_GRANT_DUPL_CIPHER);
+   LEX *lex=lex;
+   if (lex->ssl_cipher)
+   {
+     net_printf(&lex->thd->net,ER_DUP_ARGUMENT, "CHIPER");
      YYABORT;
-   } else 
-     Lex->ssl_cipher=$2.str;
+   }
+   lex->ssl_cipher=$2.str;
  }
  
 opt_table:
@@ -3491,7 +3497,7 @@ union_list:
     if (lex->exchange)
     {
        /* Only the last SELECT can have  INTO...... */
-       net_printf(&current_thd->net, ER_WRONG_USAGE,"UNION","INTO");
+       net_printf(&lex->thd->net, ER_WRONG_USAGE,"UNION","INTO");
        YYABORT;
     } 
     mysql_new_select(lex);