diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-09-22 17:11:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-09-22 17:11:40 +0300 |
| commit | 620d14f8c3521f9ec7283b8690e0e16434739d33 (patch) | |
| tree | b3438fd90e14b3be2ec21e53cca37cd795090a00 /sql/handler.h | |
| parent | 288eeb3a31e4bfb52180f3906a4d354ac9cc457e (diff) | |
| parent | 3e83c4e8f90851040be921443b52144a2862444a (diff) | |
| download | mariadb-git-620d14f8c3521f9ec7283b8690e0e16434739d33.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index b6052412069..874e0de210c 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1997,7 +1997,7 @@ public: void adjust_next_insert_id_after_explicit_value(ulonglong nr); int update_auto_increment(); - void print_keydup_error(uint key_nr, const char *msg); + void print_keydup_error(uint key_nr, const char *msg, myf errflag); virtual void print_error(int error, myf errflag); virtual bool get_error_message(int error, String *buf); uint get_dup_key(int error); @@ -2046,7 +2046,8 @@ public: if (!error || ((flags & HA_CHECK_DUP_KEY) && (error == HA_ERR_FOUND_DUPP_KEY || - error == HA_ERR_FOUND_DUPP_UNIQUE))) + error == HA_ERR_FOUND_DUPP_UNIQUE)) || + error == HA_ERR_AUTOINC_ERANGE) return FALSE; return TRUE; } |