diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
| commit | 38e3ae155db08ab2e9e5c267f05f89bec0542b33 (patch) | |
| tree | 7289bbef1ba3f495aa5c7cdb7d0a3f993a5bbc80 /sql/share | |
| parent | c56483d972d023105fbcb0f47af0042ee092657c (diff) | |
| parent | ed1ba992c1d3c3ecbe6a2769c51ceb5d27606d3b (diff) | |
| download | mariadb-git-38e3ae155db08ab2e9e5c267f05f89bec0542b33.tar.gz | |
mysql-5.5 merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 0153c3f90b0..4798483860c 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6371,7 +6371,7 @@ 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" + eng "A variable of a non-integer based 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." |