Ticket #177: mysql-utf8.patch

storage/storage_mysql.c

@@ -623 +623 @@
     mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, "jabberd");
 #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) {
         log_write(drv->st->sm->log, LOG_ERR, "mysql: connection to database failed: %s", mysql_error(conn));
@@ -630 +632 @@
         return st_FAILED;
     }
 
-    mysql_query(conn, "SET NAMES 'utf8'");
-
     /* Set reconnect flag to 1 (set to 0 by default from mysql 5 on) */
     conn->reconnect = 1;