From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 2 Jun 2016 08:08:58 +0000 (+0200)
Subject: [master] Merge branch 'trac4281'
X-Git-Tag: trac4106_update_base~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8a306a27d1cae03f6bc5223c30806f5cd1b64f4;p=thirdparty%2Fkea.git

[master] Merge branch 'trac4281'
---

b8a306a27d1cae03f6bc5223c30806f5cd1b64f4
diff --cc src/lib/dhcpsrv/mysql_connection.cc
index e26c2332db,432805c34e..30de103d53
--- a/src/lib/dhcpsrv/mysql_connection.cc
+++ b/src/lib/dhcpsrv/mysql_connection.cc
@@@ -29,8 -27,27 +29,28 @@@ const my_bool MLM_TRUE = 1
  const int MLM_MYSQL_FETCH_SUCCESS = 0;
  const int MLM_MYSQL_FETCH_FAILURE = 1;
  
 +const int MYSQL_DEFAULT_CONNECTION_TIMEOUT = 5;	// seconds
  
+ MySqlTransaction::MySqlTransaction(MySqlConnection& conn)
+     : conn_(conn), committed_(false) {
+     conn_.startTransaction();
+ }
+ 
+ MySqlTransaction::~MySqlTransaction() {
+     // Rollback if the MySqlTransaction::commit wasn't explicitly
+     // called.
+     if (!committed_) {
+         conn_.rollback();
+     }
+ }
+ 
+ void
+ MySqlTransaction::commit() {
+     conn_.commit();
+     committed_ = true;
+ }
+ 
+ 
  // Open the database using the parameters passed to the constructor.
  
  void