fixed one bug for reopen mysql db in lib_acl

zhengshuxin · zhengshuxin · commit 5d3a33350fb2 · 2022-04-19T14:36:34.000+08:00
diff --git a/lib_acl/src/db/mysql/acl_dbpool_mysql.c b/lib_acl/src/db/mysql/acl_dbpool_mysql.c
@@ -218,6 +218,8 @@ int sane_mysql_reopen(ACL_DB_HANDLE *handle)
 	MYSQL *myconn_saved = mysql_handle->connection;
 	ACL_DB_INFO *db_info = &mysql_handle->handle.parent->db_info;
 
+	__close_mysql_handle(mysql_handle);
+
 	if (__open_mysql_handle((ACL_DB_POOL_MYSQL*) handle->parent,
 			mysql_handle, db_info) == NULL)
 	{
@@ -226,7 +228,6 @@ int sane_mysql_reopen(ACL_DB_HANDLE *handle)
 		mysql_handle->connection = myconn_saved;
 		return (-1);
 	}
-	__close_mysql_handle(mysql_handle);
 	return (0);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,8 @@ int sane_mysql_reopen(ACL_DB_HANDLE *handle)`
`218`	`218`	`MYSQL *myconn_saved = mysql_handle->connection;`
`219`	`219`	`ACL_DB_INFO *db_info = &mysql_handle->handle.parent->db_info;`
`220`	`220`
	`221`	`+ __close_mysql_handle(mysql_handle);`
	`222`	`+`
`221`	`223`	`if (__open_mysql_handle((ACL_DB_POOL_MYSQL*) handle->parent,`
`222`	`224`	`mysql_handle, db_info) == NULL)`
`223`	`225`	`{`
`@@ -226,7 +228,6 @@ int sane_mysql_reopen(ACL_DB_HANDLE *handle)`
`226`	`228`	`mysql_handle->connection = myconn_saved;`
`227`	`229`	`return (-1);`
`228`	`230`	`}`
`229`		`- __close_mysql_handle(mysql_handle);`
`230`	`231`	`return (0);`
`231`	`232`	`}`
`232`	`233`