diff options
| author | mkindahl@dl145h.mysql.com <> | 2008-04-01 08:43:15 +0200 |
|---|---|---|
| committer | mkindahl@dl145h.mysql.com <> | 2008-04-01 08:43:15 +0200 |
| commit | fb9e8ed5e8172384ade1cf9803bf556dd6ddc14f (patch) | |
| tree | 732e749b2105e57f7473f609be312393ac7a2abe /sql/share | |
| parent | f13f6eaff3e632eb595c90f8c035b24acf96a60f (diff) | |
| parent | 6c8a0887ccced5815b91808245976dc4204a09fc (diff) | |
| download | mariadb-git-fb9e8ed5e8172384ade1cf9803bf556dd6ddc14f.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index a3514776d6e..a450f7a2045 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5641,7 +5641,7 @@ ER_NAME_BECOMES_EMPTY eng "Name '%-.64s' has become ''" ER_AMBIGUOUS_FIELD_TERM eng "First character of the FIELDS TERMINATED string is ambiguous; please use non-optional and non-empty FIELDS ENCLOSED BY" - ER_LOAD_DATA_INVALID_COLUMN eng "Invalid column reference (%-.64s) in LOAD DATA" - +ER_LOG_PURGE_NO_FILE + eng "Being purged log %s was not found" |