--- lbbs/src/database.c	2025/05/05 11:46:04	1.12
+++ lbbs/src/database.c	2025/07/02 04:17:33	1.17
@@ -1,16 +1,15 @@
 /***************************************************************************
 						 database.c  -  description
 							 -------------------
-	begin                : Mon Oct 11 2004
-	copyright            : (C) 2004 by Leaflet
-	email                : leaflet@leafok.com
+	Copyright            : (C) 2004-2025 by Leaflet
+	Email                : leaflet@leafok.com
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
+ *   the Free Software Foundation; either version 3 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
@@ -18,8 +17,8 @@
 #include "common.h"
 #include "database.h"
 #include "log.h"
-#include <mysql.h>
 #include <stdio.h>
+#include <mysql/mysql.h>
 
 // Global declaration for database
 char DB_host[256];
@@ -30,7 +29,7 @@ char DB_timezone[50];
 
 MYSQL *db_open()
 {
-	MYSQL *db;
+	MYSQL *db = NULL;
 	char sql[SQL_BUFFER_LEN];
 
 	db = mysql_init(NULL);
@@ -40,27 +39,29 @@ MYSQL *db_open()
 		return NULL;
 	}
 
-	db = mysql_real_connect(db, DB_host, DB_username, DB_password, DB_database,
-							0, NULL, 0);
-	if (db == NULL)
+	if (mysql_real_connect(db, DB_host, DB_username, DB_password, DB_database,
+						   0, NULL, 0) == NULL)
 	{
-		log_error("mysql_connect() failed\n");
+		log_error("mysql_real_connect() error: %s\n", mysql_error(db));
+		mysql_close(db);
 		return NULL;
 	}
 
-	if (mysql_set_character_set(db, "gb2312") != 0)
+	if (mysql_set_character_set(db, "utf8") != 0)
 	{
-		log_error("Set character set failed\n");
+		log_error("Set character set error: %s\n", mysql_error(db));
+		mysql_close(db);
 		return NULL;
 	}
 
 	snprintf(sql, sizeof(sql),
-			"SET time_zone = '%s'",
-			DB_timezone);
+			 "SET time_zone = '%s'",
+			 DB_timezone);
 
 	if (mysql_query(db, sql) != 0)
 	{
-		log_error("Set timezone failed\n");
+		log_error("Set timezone error: %s\n", mysql_error(db));
+		mysql_close(db);
 		return NULL;
 	}