diff options
| author | Andrei Elkin <andrei.elkin@oracle.com> | 2012-04-21 13:24:39 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@oracle.com> | 2012-04-21 13:24:39 +0300 |
| commit | 14de6de946d78dc2c5674d7d1e27edc170e5de6b (patch) | |
| tree | 5f529072426678936974bb7abecd548dc5af7004 /sql/share | |
| parent | dcb5071b1906d76b4c61d3125ddc7368f3ee8c4f (diff) | |
| parent | 49e484c8cd2e362e843bbd5d756422cc7e2686d3 (diff) | |
| download | mariadb-git-14de6de946d78dc2c5674d7d1e27edc170e5de6b.tar.gz | |
merge bug11754117-45670 fixes from 5.1.
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 4434ecafc29..c8cacd22303 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6500,6 +6500,9 @@ ER_BINLOG_UNSAFE_INSERT_TWO_KEYS ER_UNSUPPORTED_ENGINE eng "Storage engine '%s' does not support system tables. [%s.%s]" +ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST + eng "INSERT into autoincrement field which is not the first part in the composed primary key is unsafe." + # # End of 5.5 error messages. # |