diff options
| author | paul@teton.kitebird.com <> | 2004-02-16 12:05:25 -0600 |
|---|---|---|
| committer | paul@teton.kitebird.com <> | 2004-02-16 12:05:25 -0600 |
| commit | f33c6699fd8245fcb2c6ac9828c873d9c06b8c8c (patch) | |
| tree | bc7f298581c294f703065008ec778ecbce763b03 /sql/share/french | |
| parent | e7bbf692aef7708dc70b3d7c6ff25f7df5537770 (diff) | |
| parent | 25aff697d17d023b1fe0c085f3215a1358832e5e (diff) | |
| download | mariadb-git-f33c6699fd8245fcb2c6ac9828c873d9c06b8c8c.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
Diffstat (limited to 'sql/share/french')
| -rw-r--r-- | sql/share/french/errmsg.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 05c27548a45..a17adf90545 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -276,7 +276,7 @@ character-set=latin1 "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.", +"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", "Wrong parameter or combination of parameters for START SLAVE UNTIL", @@ -289,7 +289,7 @@ character-set=latin1 "Unknown key cache '%-.100s'", "MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work", "Unknown table engine '%s'", -"'%s' is deprecated. Use '%s' instead.", -"The target table %-.100s of the %s is not updatable.", -"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working" +"'%s' is deprecated, use '%s' instead", +"The target table %-.100s of the %s is not updatable", +"The '%s' feature was disabled; you need MySQL built with '%s' define to have it working" "MySQL is started in --skip-grant-tables mode. You can't use this command" |