diff options
| author | kostja@bodhi.(none) <> | 2008-04-19 14:37:20 +0400 |
|---|---|---|
| committer | kostja@bodhi.(none) <> | 2008-04-19 14:37:20 +0400 |
| commit | db70574976441201c67e67a249675df0763e7340 (patch) | |
| tree | d45e65eb7b3c91ac492f651592c763f36836e04f /sql/share | |
| parent | 013fd236755ec402a988eaa70392e0a08c169ac0 (diff) | |
| parent | 78e4f40173cde43a415f80b446ef83729847df3f (diff) | |
| download | mariadb-git-db70574976441201c67e67a249675df0763e7340.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-27430
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 894e2094968..23710f69579 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6121,8 +6121,15 @@ 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" + +ER_NEED_REPREPARE + eng "Prepared statement needs to be re-prepared" + +ER_PS_REBIND + eng "Prepared statement result set has changed, a rebind needed" |