summaryrefslogtreecommitdiff
path: root/sql/share/german
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2003-09-09 22:26:19 +0300
committerbell@sanja.is.com.ua <>2003-09-09 22:26:19 +0300
commitad07ffbf6dcd589b12ee69eb5670e4ea88efa23c (patch)
tree47d59fda36f5521a5dd083c51d5e5dd1fed3da89 /sql/share/german
parent48825fe40bb6e7a1f07fe50f7b19270db64dc157 (diff)
parenta0bf98b7a4999fba4f402904a5149611975a72b9 (diff)
downloadmariadb-git-ad07ffbf6dcd589b12ee69eb5670e4ea88efa23c.tar.gz
merge
Diffstat (limited to 'sql/share/german')
-rw-r--r--sql/share/german/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 6910894b095..512f593dc53 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -278,4 +278,6 @@
"Illegal mix of collations for operation '%s'",
"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
"Unknown collation: '%-.64s'",
+"SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support. They can be used later when MySQL slave with SSL will be started."
+"Server is running in --secure-auth mode, but '%s@%s' has a password in the old format; please change the password to the new format"
"Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",