diff options
| author | unknown <kostja@oak.local> | 2003-07-31 17:11:52 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-07-31 17:11:52 +0400 |
| commit | 4acc45d78427c27d78b5a297f713eeae522f8945 (patch) | |
| tree | a08ffe6a07c8efcc13a357c5478274972fd673b0 /sql/share/slovak/errmsg.txt | |
| parent | 79fea68bd7da9735fdbb9d6e4c40879d0e72ff70 (diff) | |
| parent | 2c3cba310aa401842996a52abdbde95bb950fcc5 (diff) | |
| download | mariadb-git-4acc45d78427c27d78b5a297f713eeae522f8945.tar.gz | |
manual merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
merge commit
convert of database to utf8 in case of cahnge_user added
Diffstat (limited to 'sql/share/slovak/errmsg.txt')
| -rw-r--r-- | sql/share/slovak/errmsg.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt index ed1d8cadb80..b7cdd6fc1b4 100644 --- a/sql/share/slovak/errmsg.txt +++ b/sql/share/slovak/errmsg.txt @@ -276,3 +276,4 @@ "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'", +"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" |