Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickaël Rémond <mickael.remond@process-one.net>2007-08-12 19:41:00 +0400
committerMickaël Rémond <mickael.remond@process-one.net>2007-08-12 19:41:00 +0400
commit884c8d531f82300179ae07eb090449491eb9779d (patch)
tree329c08fffcb5bf5dc08a596a78cb6ee659cc5807
parent8561ba614f5c9a3cfc569f675840852fba09f493 (diff)
* src/odbc/ejabberd_odbc.erl: UTF-8 support for MySQL5 (EJAB-318).
SVN Revision: 869
-rw-r--r--ChangeLog4
-rw-r--r--src/odbc/ejabberd_odbc.erl1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ccba3331..eb2a977af 100644
--- 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-01 Mickael Remond <mickael.remond@process-one.net>
* src/mod_private.erl: Reduce memory consumption on user private
diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index b4fd41244..55214897d 100644
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -272,6 +272,7 @@ mysql_connect(Server, DB, Username, Password) ->
case mysql_conn:start(Server, ?MYSQL_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]),