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

25 files changed, 45 insertions, 82 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 9a6768d7025..8d9fda437a5 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -231,6 +231,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 42ff7206046..81d44de6a87 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -225,6 +225,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 0819e355422..68e20deb257 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -228,6 +228,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index f5888440743..5d057c30a0e 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -222,6 +222,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 7ad829d1f04..3f9d15c2e4d 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -226,6 +226,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 2ac778877f6..7d9c6202c5f 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -222,6 +222,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 6cf9d8dd2a1..14bd0f8a042 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -225,6 +225,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 65954ce1c2e..ab1103a56b4 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -222,6 +222,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 28ee01934c0..33d51cb0e60 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -224,6 +224,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 2d778692e9a..127a33bbb28 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -222,6 +222,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 248c5e1b566..e345f462f2a 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -224,6 +224,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 3a2086accf1..dd1d92adf64 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -222,6 +222,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index f701bdd1ade..bbdf23e4056 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -224,6 +224,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 00c23acaca9..6139b1bb700 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -224,6 +224,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 56573f93a00..39ff72acba1 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -226,6 +226,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index f15cbc930cb..a522e792750 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -222,6 +222,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 9f83e98828e..0177ff942a0 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -226,6 +226,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 8851866b249..c6b5c324cad 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -225,6 +225,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 08b5bfe6ba9..26ca2881212 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -230,6 +230,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 6348f416277..8bbf04c9a3d 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -223,6 +223,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 83e08254f90..b4303de8619 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -222,6 +222,4 @@
 "SELECT kommandona har olika antal kolumner"
 "Kan inte utföra kommandot emedan du har ett READ lås",
 "Blandning av transaktionella och icke-transaktionella tabeller är inaktiverat",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' användes två gånger",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 776103cf681..80c2bcc06fb 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -227,6 +227,4 @@
 "The used SELECT statements have a different number of columns",
 "Can't execute the query because you have a conflicting read lock",
 "Mixing of transactional and non-transactional tables is disabled",
-"Duplicate SUBJECT option in GRANT clause",
-"Duplicate ISSUER option in GRANT clause",
-"Duplicate CIPHER option in GRANT clause",
+"Option '%s' used twice in statement",
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 81464053cd4..c3f98713c45 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -147,7 +147,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length)
   lex->select->in_sum_expr=0;
   lex->select->expr_list.empty();
   lex->select->ftfunc_list.empty();
-  lex->convert_set=thd->convert_set;
+  lex->convert_set=(lex->thd=thd)->convert_set;
   lex->yacc_yyss=lex->yacc_yyvs=0;
   lex->ignore_space=test(thd->sql_mode & MODE_IGNORE_SPACE);
   return lex;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 3121f453974..6ccb0a6b059 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -168,6 +168,7 @@ typedef struct st_lex {
   CONVERT *convert_set;
   LEX_USER *grant_user;
   gptr yacc_yyss,yacc_yyvs;
+  THD *thd;
   udf_func udf;
   HA_CHECK_OPT   check_opt;			// check/repair options
   HA_CREATE_INFO create_info;
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);