aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-03-13 14:34:47 +0000
committerBadlop <badlop@process-one.net>2008-03-13 14:34:47 +0000
commit04aec272db1d398badf0f67c0c222da7f63a108b (patch)
tree3ea317359376d48bf184b1f8fed2839366b99a8d
parent* src/ejabberd.hrl: Removed unused ejabberd_debug and (diff)
* src/odbc/ejabberd_odbc.erl: Start ODBC explicitely because
Erlang R12 doesn't start automatically like in R11 and older (thanks to Sergei Golovan)(EJAB-541) SVN Revision: 1231
-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 e5a6494b3..dff2cd6d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-03-13 Badlop <badlop@process-one.net>
+ * src/odbc/ejabberd_odbc.erl: Start ODBC explicitely because
+ Erlang R12 doesn't start automatically like in R11 and
+ older (thanks to Sergei Golovan)(EJAB-541)
+
* src/ejabberd.hrl: Removed unused ejabberd_debug and
PRIVACY_SUPPORT. Reordered the remaining options
diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index 3a028359e..a1717a665 100644
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -246,6 +246,7 @@ execute_transaction(State, F, NRestarts) ->
%% part of init/1
%% Open an ODBC database connection
odbc_connect(SQLServer) ->
+ application:start(odbc),
case odbc:connect(SQLServer,[{scrollable_cursors, off}]) of
{ok, Ref} ->
erlang:monitor(process, Ref),