diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-03-10 20:28:41 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-03-10 20:28:41 +0000 |
| commit | 42c96c7ebac771513c0866c13cb5bd9c672d6d40 (patch) | |
| tree | c5dd369b1ce37b5593c4e71c573287b9c6916e3d /sql/share | |
| parent | eb79ef1535f092a2e3fee9cf514ff0c581de0bd2 (diff) | |
| parent | 3fad4e8df1281c43d4fd343d3107b0a8e52c2327 (diff) | |
| download | mariadb-git-42c96c7ebac771513c0866c13cb5bd9c672d6d40.tar.gz | |
Merge next-mr-bugfixing (local) --> next-mr-bugfixing.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 7ea8c75e43e..30d12e89ca0 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6321,3 +6321,6 @@ ER_SPATIAL_MUST_HAVE_GEOM_COL 42000 ER_TOO_LONG_INDEX_COMMENT eng "Comment for index '%-.64s' is too long (max = %lu)" + +ER_BINLOG_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE + eng "Mixing self-logging and non-self-logging engines in a statement is unsafe." |