Changeset 472

Timestamp:

22/12/07 13:58:56 (12 months ago)

Author:

smoku

Message:

Changed the way UTF-8 is selected on MySQL connection. Fixes #177

Files:

• trunk/storage/storage_mysql.c (modified) (2 diffs)

trunk/storage/storage_mysql.c

@@ -624 +624 @@
 #endif
 
+    mysql_options(conn, MYSQL_SET_CHARSET_NAME, "utf8");
+
     /* connect with CLIENT_INTERACTIVE to get a (possibly) higher timeout value than default */
     if(mysql_real_connect(conn, host, user, pass, dbname, atoi(port), NULL, CLIENT_INTERACTIVE) == NULL) {
@@ -631 +633 @@
     }
 
-    mysql_query(conn, "SET NAMES 'utf8'");
-
     /* Set reconnect flag to 1 (set to 0 by default from mysql 5 on) */
     conn->reconnect = 1;
 
-    data = (drvdata_t) malloc(sizeof(struct drvdata_st));
-    memset(data, 0, sizeof(struct drvdata_st));
+    data = (drvdata_t) calloc(1, sizeof(struct drvdata_st));
 
     data->conn = conn;