summaryrefslogtreecommitdiff
path: root/sql/share/english
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-10-08 07:24:04 +0300
committermonty@hundin.mysql.fi <>2001-10-08 07:24:04 +0300
commit2f603156eddc80d74db506604953c97eab169ace (patch)
tree368e07bec37e044cbac9f95a7ca572c494968756 /sql/share/english
parent938a8dc2ef15eb0878c9a71f2f60ae521084494a (diff)
downloadmariadb-git-2f603156eddc80d74db506604953c97eab169ace.tar.gz
Cleanup after last merge
Diffstat (limited to 'sql/share/english')
-rw-r--r--sql/share/english/errmsg.txt4
1 files changed, 1 insertions, 3 deletions
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",