diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-09-09 22:26:19 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-09-09 22:26:19 +0300 |
| commit | 62a33db03b616d29009d8f2bef5e4c9f5c4b319d (patch) | |
| tree | 47d59fda36f5521a5dd083c51d5e5dd1fed3da89 /sql/share/estonian | |
| parent | 542440e82318c65fc596bcdaa895dc6ba0698c46 (diff) | |
| parent | 4a35c8e2389d49e281152d803ca4c9fc3005d08d (diff) | |
| download | mariadb-git-62a33db03b616d29009d8f2bef5e4c9f5c4b319d.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/share/estonian')
| -rw-r--r-- | sql/share/estonian/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt index c1d7762fef8..9312dfa9dc2 100644 --- a/sql/share/estonian/errmsg.txt +++ b/sql/share/estonian/errmsg.txt @@ -274,4 +274,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", |