* src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318).

SVN Revision: 868

diff --git a/ChangeLog b/ChangeLog
index 179d7653a8a0441032ea8127d97cbd0b61aef2ae..3ebdd2b76e6994095f7778bb5467d3bf53a6c336 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-12  Mickael Remond  <mickael.remond@process-one.net>
+
+       * src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318).
+
 2007-08-09  Alexey Shchepin  <alexey@sevcom.net>
 
        * doc/guide.tex: Minor update (thanks to Sergei Golovan)

diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index a10b07a91c14a6f323e0ae21003a07021bf34436..e4f383fe2625d7c57b85137ecf0dbca7e94f0044 100644 (file)
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -279,6 +279,7 @@ mysql_connect(Server, Port, DB, Username, Password) ->
     case mysql_conn:start(Server, Port, Username, Password, DB, NoLogFun) of
        {ok, Ref} ->
            erlang:monitor(process, Ref),
+            mysql_conn:fetch(Ref, ["set names 'utf8';"], self()), 
            {ok, #state{db_ref = Ref, db_type = mysql}};
        {error, Reason} ->
            ?ERROR_MSG("MySQL connection failed: ~p~n", [Reason]),