diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-07 17:39:01 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-07 17:39:01 +0000 |
| commit | 4b67a11d2bf201e273be79054b26e90ada15be38 (patch) | |
| tree | 10a62487f399014ad77654fbf666cf1a6bf8f5ac /sql/share/errmsg.txt | |
| parent | 5dcb0e447fe2dbcb4584e9db15836eaf4c1da0a1 (diff) | |
| parent | a533cec71b5d0df0656fe00de107bc1472835500 (diff) | |
| download | mariadb-git-4b67a11d2bf201e273be79054b26e90ada15be38.tar.gz | |
merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
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 b12141cd30f..021694026ae 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6299,3 +6299,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" |