From 915d94b0dcdfb3e4530952d97f00dd8a4de7d694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?= Date: Sun, 12 Aug 2007 15:39:01 +0000 Subject: [PATCH] * src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318). SVN Revision: 868 --- ChangeLog | 4 ++++ src/odbc/ejabberd_odbc.erl | 1 + 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 179d7653a..3ebdd2b76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-08-12 Mickael Remond + + * src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318). + 2007-08-09 Alexey Shchepin * doc/guide.tex: Minor update (thanks to Sergei Golovan) diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl index a10b07a91..e4f383fe2 100644 --- 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]),