diff options
| author | kostja@oak.local <> | 2003-07-09 18:24:43 +0400 |
|---|---|---|
| committer | kostja@oak.local <> | 2003-07-09 18:24:43 +0400 |
| commit | 941a8623cafac7904e07a50793b41f4131586a5d (patch) | |
| tree | 9774a7006312380fb4dbc92767fe0c009a485b12 /sql/share/portuguese | |
| parent | 39e7db9f51fb9f78d7c3846ad11afd1f13778593 (diff) | |
| parent | 0f28677af605bafbb0bcc431a9d467f1d1457d72 (diff) | |
| download | mariadb-git-941a8623cafac7904e07a50793b41f4131586a5d.tar.gz | |
resolved conflict with pulled changeset
Diffstat (limited to 'sql/share/portuguese')
| -rw-r--r-- | sql/share/portuguese/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt index 14a1e6763b4..d904243e2fb 100644 --- a/sql/share/portuguese/errmsg.txt +++ b/sql/share/portuguese/errmsg.txt @@ -267,3 +267,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" |