changeset 2353:849f12c9c7d0 HEAD

MySQL reconnection memleak fix.
author Timo Sirainen <tss@iki.fi>
date Fri, 23 Jul 2004 06:23:18 +0300
parents a75f04938f49
children 1556d9ba23dc
files src/auth/db-mysql.c
diffstat 1 files changed, 12 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/db-mysql.c	Fri Jul 23 06:22:15 2004 +0300
+++ b/src/auth/db-mysql.c	Fri Jul 23 06:23:18 2004 +0300
@@ -97,21 +97,19 @@
 			i_error("MySQL: mysql_init failed");
 			return FALSE;
 		}
+	}
 
-		if (!mysql_real_connect(conn->mysql, conn->set.db_host,
-					conn->set.db_user, conn->set.db_passwd,
-					conn->set.db,
-					conn->set.db_port,
-					conn->set.db_unix_socket,
-					conn->set.db_client_flags)) {
-			i_error("MySQL: Can't connect to database %s: %s",
-				conn->set.db, mysql_error(conn->mysql));
-			conn->connected = FALSE;
-			conn->mysql = NULL;
-		} else {
-			conn->connected = TRUE;
-			i_info("MySQL: connected to %s", conn->set.db_host);
-		}
+	if (mysql_real_connect(conn->mysql, conn->set.db_host,
+			       conn->set.db_user, conn->set.db_passwd,
+			       conn->set.db,
+			       conn->set.db_port,
+			       conn->set.db_unix_socket,
+			       conn->set.db_client_flags) == NULL) {
+		i_error("MySQL: Can't connect to database %s: %s",
+			conn->set.db, mysql_error(conn->mysql));
+	} else {
+		conn->connected = TRUE;
+		i_info("MySQL: connected to %s", conn->set.db_host);
 	}
 	
 	return conn->connected;