summaryrefslogtreecommitdiff
path: root/sql/share/russian
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2003-03-02 14:05:03 +0400
committerunknown <bar@bar.mysql.r18.ru>2003-03-02 14:05:03 +0400
commit10190533925b35f7a9c22548751ca9c917aed93d (patch)
treedcde912eca28f9bc0b31e164c7918c8674948a04 /sql/share/russian
parent0d19df2f5d019657b46d11f9e725b2eea704e209 (diff)
downloadmariadb-git-10190533925b35f7a9c22548751ca9c917aed93d.tar.gz
New error message for situation like:
SELECT latin1_expr COLLATE anpther_charset_collation
Diffstat (limited to 'sql/share/russian')
-rw-r--r--sql/share/russian/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 61de4241b85..848d9969d58 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -255,3 +255,4 @@
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
"All parts of a SPATIAL KEY must be NOT NULL"
+"COLLATION '%s' is not valid for CHARACTER SET '%s'"