aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMickaël Rémond <mickael.remond@process-one.net>2007-07-17 07:09:04 +0000
committerMickaël Rémond <mickael.remond@process-one.net>2007-07-17 07:09:04 +0000
commit745be8373fef61f33b4ff78880146b5e26c884a9 (patch)
tree39a39d4a7ebb3bfef5123dc6cbfb3f15d6f870e8 /src
parent* src/ejabberd_s2s.erl: Added remove_connection/3 (diff)
* src/odbc/ejabberd_odbc.erl: Better error handling for MySQL native driver (EJAB-224).
SVN Revision: 813
Diffstat (limited to 'src')
-rw-r--r--src/odbc/ejabberd_odbc.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/odbc/ejabberd_odbc.erl b/src/odbc/ejabberd_odbc.erl
index 454c81708..a10b07a91 100644
--- a/src/odbc/ejabberd_odbc.erl
+++ b/src/odbc/ejabberd_odbc.erl
@@ -293,6 +293,8 @@ mysql_to_odbc({updated, MySQLRes}) ->
mysql_to_odbc({data, MySQLRes}) ->
mysql_item_to_odbc(mysql:get_result_field_info(MySQLRes),
mysql:get_result_rows(MySQLRes));
+mysql_to_odbc({error, MySQLRes}) when is_list(MySQLRes) ->
+ {error, MySQLRes};
mysql_to_odbc({error, MySQLRes}) ->
{error, mysql:get_result_reason(MySQLRes)}.