diff options
| author | Mats Kindahl <mats@sun.com> | 2009-12-15 21:21:00 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2009-12-15 21:21:00 +0100 |
| commit | f9abd14225821a3912a15baa199bcbec7d9e65c1 (patch) | |
| tree | d3057d76feb0f4419510a9a2a77dcc4263948d7f /sql/share/errmsg.txt | |
| parent | ac647f5a3eb12313f981800ac1fd0c562402abcc (diff) | |
| parent | 9e980bf79ef0c727c630e79c1bc043c48bc947ee (diff) | |
| download | mariadb-git-f9abd14225821a3912a15baa199bcbec7d9e65c1.tar.gz | |
Merging with mysql-5.1-rep+2
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 91cb8c261df..c3d9235bc30 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6216,3 +6216,8 @@ ER_DEBUG_SYNC_TIMEOUT ER_DEBUG_SYNC_HIT_LIMIT eng "debug sync point hit limit reached" ger "Debug Sync Point Hit Limit erreicht" + +ER_SLAVE_CONVERSION_FAILED + eng "Column %d of table '%-.192s.%-.192s' cannot be converted from type '%-.32s' to type '%-.32s'" +ER_SLAVE_CANT_CREATE_CONVERSION + eng "Can't create conversion table for table '%-.192s.%-.192s'" |