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/sql_lex.cc | |
| parent | dcb5071b1906d76b4c61d3125ddc7368f3ee8c4f (diff) | |
| parent | 49e484c8cd2e362e843bbd5d756422cc7e2686d3 (diff) | |
| download | mariadb-git-14de6de946d78dc2c5674d7d1e27edc170e5de6b.tar.gz | |
merge bug11754117-45670 fixes from 5.1.
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 7e548ff11c7..1d7438503f1 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -67,7 +67,8 @@ Query_tables_list::binlog_stmt_unsafe_errcode[BINLOG_STMT_UNSAFE_COUNT] = ER_BINLOG_UNSAFE_CREATE_REPLACE_SELECT, ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC, ER_BINLOG_UNSAFE_UPDATE_IGNORE, - ER_BINLOG_UNSAFE_INSERT_TWO_KEYS + ER_BINLOG_UNSAFE_INSERT_TWO_KEYS, + ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST }; |