From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Wed, 30 Aug 2023 10:21:12 +0000 (+0300)
Subject: lib-sql: driver-mysql - Use driver_mysql_disconnect() in deinit
X-Git-Tag: 2.4.0~2604
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34cf760e358117e6b52e49b60c59d28418725308;p=thirdparty%2Fdovecot%2Fcore.git

lib-sql: driver-mysql - Use driver_mysql_disconnect() in deinit

This ensures we call mysql_close() only in one place.
---

diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c
index bb672189f9..c7bff3d1ab 100644
--- a/src/lib-sql/driver-mysql.c
+++ b/src/lib-sql/driver-mysql.c
@@ -317,9 +317,7 @@ static void driver_mysql_deinit_v(struct sql_db *_db)
 	_db->no_reconnect = TRUE;
 	sql_db_set_state(&db->api, SQL_DB_STATE_DISCONNECTED);
 
-	if (db->mysql != NULL)
-		mysql_close(db->mysql);
-	db->mysql = NULL;
+	driver_mysql_disconnect(_db);
 
 	sql_connection_log_finished(_db);
 	event_unref(&_db->event);