summaryrefslogtreecommitdiff
path: root/sql/share/norwegian-ny
diff options
context:
space:
mode:
authorkostja@oak.local <>2003-07-17 14:55:13 +0400
committerkostja@oak.local <>2003-07-17 14:55:13 +0400
commit7dab500b7a8ac2ae8b8ca81eaeac839243a35457 (patch)
tree6abebe920fb2f0f42de3a2b69d159857ca7154cd /sql/share/norwegian-ny
parent9e3561e45e4377ff9420ce5dc5a36e02b37cbc5a (diff)
parent941a8623cafac7904e07a50793b41f4131586a5d (diff)
downloadmariadb-git-7dab500b7a8ac2ae8b8ca81eaeac839243a35457.tar.gz
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1
Diffstat (limited to 'sql/share/norwegian-ny')
-rw-r--r--sql/share/norwegian-ny/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 96c11871502..d565150dfe3 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -269,3 +269,4 @@
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
"Illegal mix of collations for operation '%s'",
"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"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"