summaryrefslogtreecommitdiff
path: root/sql/share/hungarian
diff options
context:
space:
mode:
authorunknown <kostja@oak.local>2003-07-17 14:55:13 +0400
committerunknown <kostja@oak.local>2003-07-17 14:55:13 +0400
commit09c3520bfaa594ca9d0d8c3789be5c3caeab2583 (patch)
tree6abebe920fb2f0f42de3a2b69d159857ca7154cd /sql/share/hungarian
parent85cc1227942783a381d56490960d25774d4c6516 (diff)
parent04a75388e4e127652685bb8010d04fbb7c5e3b0b (diff)
downloadmariadb-git-09c3520bfaa594ca9d0d8c3789be5c3caeab2583.tar.gz
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1 sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/lex.h: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'sql/share/hungarian')
-rw-r--r--sql/share/hungarian/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 6b27cdc2551..a58093c08d8 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/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"