--- lbbs/src/database.c	2004/10/20 07:46:32	1.2
+++ lbbs/src/database.c	2007/09/12 03:21:49	1.6
@@ -15,26 +15,41 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "bbs.h"
 #include "common.h"
+#include <mysql.h>
+#include <stdio.h>
 
 MYSQL *
 db_open ()
 {
   MYSQL *db;
-  
-  db = mysql_init(NULL);
+
+  db = mysql_init (NULL);
   if (db == NULL)
-  {
-    log_error("mysql_init() failed\n");
-    return NULL;
-  }
+    {
+      log_error ("mysql_init() failed\n");
+      return NULL;
+    }
 
-  db = mysql_real_connect(db, DB_host, DB_username, DB_password, DB_database,
-    0, NULL, 0);
+  db = mysql_real_connect (db, DB_host, DB_username, DB_password, DB_database,
+			   0, NULL, 0);
   if (db == NULL)
-  {
-    log_error("mysql_connect() failed\n");
-    return NULL;
-  }
+    {
+      log_error ("mysql_connect() failed\n");
+      return NULL;
+    }
+
+  if (mysql_query (db, "SET CHARACTER SET gb2312") != 0)
+    {
+      log_error ("SET CHARACTER SET failed\n");
+      return NULL;
+    }
+
+  if (mysql_query (db, "SET NAMES \'gb2312\'") != 0)
+    {
+      log_error ("SET NAMES failed\n");
+      return NULL;
+    }
+
+  return db;
 }