diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-23 11:52:03 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-12-23 11:52:03 +0000 |
| commit | 2a765c87e636d7a1d8d3d3620dd42d4c67b09903 (patch) | |
| tree | 9f3fcbd9c32e2cea7483e739fdaa7a2f3e52b2bd /sql/share/errmsg.txt | |
| parent | 444b24eec2021c1bf802be7e037350947b654622 (diff) | |
| parent | f87816b450055e9815ced19d47a224bc58e9bfcc (diff) | |
| download | mariadb-git-2a765c87e636d7a1d8d3d3620dd42d4c67b09903.tar.gz | |
merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1
Diffstat (limited to 'sql/share/errmsg.txt')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index de9822d382a..25155c2cb75 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6254,3 +6254,5 @@ 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'" +ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT + eng "Cannot modify @@session.binlog_format inside a transaction" |