diff options
| author | Mats Kindahl <mats@sun.com> | 2010-04-21 08:15:10 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-04-21 08:15:10 +0200 |
| commit | b5c45fb624c3d7d97dc394986a6b77165ebc1aeb (patch) | |
| tree | 3f93fdd5f8cf3205b3c23f1a1ae8987e2e4d3a46 /sql/share | |
| parent | c0817bacafacfd3199551a64acae8c6cb60dc238 (diff) | |
| parent | 20f5c421e7a70fa4338da34ab123002cf9b00ad3 (diff) | |
| download | mariadb-git-b5c45fb624c3d7d97dc394986a6b77165ebc1aeb.tar.gz | |
Merging with mysql-trunk-bugfixing
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 21f5dd32663..ed1ed47b70f 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6327,3 +6327,12 @@ ER_LOCK_ABORTED ER_DATA_OUT_OF_RANGE 22003 eng "%s value is out of range in '%s'" + +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 (or a temporary table of any engine type) and non-transactional tables and write to any of them are unsafe." |