diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-04-19 16:02:06 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-04-19 16:02:06 +0100 |
| commit | 4ca8066fa93bf67fb69cfe17689262a50263e4ca (patch) | |
| tree | b439d3e539c3da451551c6299d5f915e712bcc48 /sql/share/errmsg-utf8.txt | |
| parent | 6d1ee1ada6bc792941418da9f94f8005d9c8bd29 (diff) | |
| parent | de3e233b8acba2b77eb8a0e7c081bd1a44efbcb3 (diff) | |
| download | mariadb-git-4ca8066fa93bf67fb69cfe17689262a50263e4ca.tar.gz | |
auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 3acf990e00d..927de5adff4 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6330,3 +6330,9 @@ ER_DATA_OUT_OF_RANGE 22003 ER_WRONG_SPVAR_TYPE_IN_LIMIT eng "A variable of a non-integer type in LIMIT clause" + +ER_BINLOG_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE + eng "Mixing self-logging and non-self-logging engines in a statement is unsafe." + +ER_BINLOG_UNSAFE_MIXED_STATEMENT + eng "Statements that read from both transactional and non-transactional tables and write to any of them are unsafe." |