22 files changed, 22 insertions, 66 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",