diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-04-01 08:43:15 +0200 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-04-01 08:43:15 +0200 |
| commit | e538761350e5461fa2efde77d1e094d8d75c2eb4 (patch) | |
| tree | 732e749b2105e57f7473f609be312393ac7a2abe /sql/share | |
| parent | 6edab4bc081b29894f3eaf70468d989ea956ff18 (diff) | |
| parent | a49184af502604008a8dad84a870af1c715defcd (diff) | |
| download | mariadb-git-e538761350e5461fa2efde77d1e094d8d75c2eb4.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
sql/share/errmsg.txt:
Manual 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" |