mysql: Don't release the connection if transactions are still using it

Fixes #2779.

diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c
index d7e35d9fd3601b735eb74d2bfd28043ca6adca34..90f8185b025148e6006a80ada8b0ac921aea20f9 100644 (file)
--- a/src/libstrongswan/plugins/mysql/mysql_database.c
+++ b/src/libstrongswan/plugins/mysql/mysql_database.c
@@ -131,9 +131,13 @@ typedef struct {
  */
 static void conn_release(private_mysql_database_t *this, conn_t *conn)
 {
-       this->mutex->lock(this->mutex);
-       conn->in_use = FALSE;
-       this->mutex->unlock(this->mutex);
+       /* do not release the connection while transactions are using it */
+       if (!this->transaction->get(this->transaction))
+       {
+               this->mutex->lock(this->mutex);
+               conn->in_use = FALSE;
+               this->mutex->unlock(this->mutex);
+       }
 }
 
 /**