diff options
| author | Francis Dupont <fdupont@isc.org> | 2019-03-13 11:47:56 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2019-03-13 11:47:56 +0100 |
| commit | ddc054076bbdae054b3f73fa2ec88abdfd1f6345 (patch) | |
| tree | e977ab7aacb50f9b748ca19e246f1e03dfb5d668 /src/lib | |
| parent | [master] Added ChangeLog entry for subnet update by ID or prefix (diff) | |
| download | kea-ddc054076bbdae054b3f73fa2ec88abdfd1f6345.tar.xz kea-ddc054076bbdae054b3f73fa2ec88abdfd1f6345.zip | |
[master] Fixed #481 merge error
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/mysql/mysql_connection.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/mysql/mysql_connection.h b/src/lib/mysql/mysql_connection.h index 2b59d8dbbb..f5841999af 100644 --- a/src/lib/mysql/mysql_connection.h +++ b/src/lib/mysql/mysql_connection.h @@ -478,7 +478,8 @@ public: if (status != 0) { // Failure: check for the special case of duplicate entry. - if (mysql_errno(mysql_) == ER_DUP_ENTRY) { + if ((mysql_errno(mysql_) == ER_DUP_ENTRY) || + (mysql_errno(mysql_) == ER_FOREIGN_DUPLICATE_KEY_WITH_CHILD_INFO)) { isc_throw(DuplicateEntry, "Database duplicate entry error"); } checkError(status, index, "unable to execute"); |