diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-31 11:57:18 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-31 11:57:18 +0300 |
| commit | f07915534b2dc82693732ee86557f92cef8de438 (patch) | |
| tree | 4420a1a039bb96e9b7dc7d13253c4481680ab92d /sql/share/errmsg.txt | |
| parent | 3d3c7fbe35e7939a92cf52afe90093d4083429c1 (diff) | |
| parent | 3afa15b53cd928ae6579ae65be82307a7b8d1de3 (diff) | |
| download | mariadb-git-f07915534b2dc82693732ee86557f92cef8de438.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/share/errmsg.txt:
merged 5.1-main to 5.1-bugteam
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 3e12cbf4f22..d37d8972c49 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6120,5 +6120,8 @@ ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT eng "The BINLOG statement of type `%s` was not preceded by a format description BINLOG statement." ER_SLAVE_CORRUPT_EVENT eng "Corrupted replication event was detected" +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" |