diff options
author | unknown <pem@mysql.com> | 2004-05-14 16:10:31 +0200 |
---|---|---|
committer | unknown <pem@mysql.com> | 2004-05-14 16:10:31 +0200 |
commit | 7edc2cf05dccd6f268fea6c63147e9151083023d (patch) | |
tree | 8e542336390a9187dee0eb53fb3eff9a519c0752 /sql/share/french/errmsg.txt | |
parent | 3a272c1fa91121d3792a558840d2b764d758f4e9 (diff) | |
parent | f3a16fef8f178b5edc47bec2c5f353495059edcf (diff) | |
download | mariadb-git-7edc2cf05dccd6f268fea6c63147e9151083023d.tar.gz |
Post-merge post-merge fix (new error codes for fparser).
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
libmysqld/Makefile.am:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.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/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/structs.h:
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
Diffstat (limited to 'sql/share/french/errmsg.txt')
-rw-r--r-- | sql/share/french/errmsg.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt index 86633b43b2e..10e670321a3 100644 --- a/sql/share/french/errmsg.txt +++ b/sql/share/french/errmsg.txt @@ -336,3 +336,8 @@ character-set=latin1 "Variable or condition declaration after cursor or handler declaration" "Cursor declaration after handler declaration" "Case not found for CASE statement" +"Configuration file '%-.64s' is too big" +"Malformed file type header in file '%-.64s'" +"Unexpected end of file during parsing comment '%-.64s'" +"Error during parsing parameter '%-.64s' (line: '%-.64s')" +"Unexpected end of file during skipping unknown parameter '%-.64s'" |