diff options
| author | unknown <anozdrin/alik@quad.opbmk> | 2008-03-28 23:54:14 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@quad.opbmk> | 2008-03-28 23:54:14 +0300 |
| commit | 45ffe7183d52cff39415e032cf9d17764b195fc0 (patch) | |
| tree | 85242b633c62e746d21c1dad825299b1b1ad2b1e /sql/share | |
| parent | e44403fe31963ef9fe8a574f0e159b9b0b67e196 (diff) | |
| parent | 7021064aaee66583e8fb2775a335739d6c66fbe5 (diff) | |
| download | mariadb-git-45ffe7183d52cff39415e032cf9d17764b195fc0.tar.gz | |
Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/r/loaddata.result:
Manually merged.
sql/share/errmsg.txt:
Manually merged.
sql/sql_load.cc:
Manually merged.
Diffstat (limited to 'sql/share')
| -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 7990baa6bb7..71d024d818a 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6120,3 +6120,6 @@ 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" |