Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

* src/odbc/ejabberd_odbc.erl: Better error handling for MySQL native driver (EJAB-224).

Browse Source 
SVN Revision: 813
This commit is contained in:
Mickaël Rémond 2007-07-17 07:09:04 +00:00
parent 2810c2b300
commit 745be8373f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
2007-07-17 Mickael Remond <mickael.remond@process-one.net>
* src/odbc/ejabberd_odbc.erl: Better error handling for MySQL
native driver (EJAB-224).
2007-07-15 Alexey Shchepin <alexey@sevcom.net> 2007-07-15 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_s2s.erl: Added remove_connection/3 * src/ejabberd_s2s.erl: Added remove_connection/3
@ -12,7 +17,7 @@
* src/mod_echo.erl: mod_echo does not reply to other * src/mod_echo.erl: mod_echo does not reply to other
components. This is to make sure that a component will not components. This is to make sure that a component will not
discover its own capabilities (EJAB-281). discover its own capabilities (Thanks to Badlop) (EJAB-281).
* src/ejabberd.cfg: disable mod_echo in the example config * src/ejabberd.cfg: disable mod_echo in the example config
file. mod_echo is mainly a development/test module. file. mod_echo is mainly a development/test module.

2
src/odbc/ejabberd_odbc.erl
View File

@ -293,6 +293,8 @@ mysql_to_odbc({updated, MySQLRes}) ->
mysql_to_odbc({data, MySQLRes}) -> mysql_to_odbc({data, MySQLRes}) ->
mysql_item_to_odbc(mysql:get_result_field_info(MySQLRes), mysql_item_to_odbc(mysql:get_result_field_info(MySQLRes),
mysql:get_result_rows(MySQLRes)); mysql:get_result_rows(MySQLRes));
mysql_to_odbc({error, MySQLRes}) when is_list(MySQLRes) ->
{error, MySQLRes};
mysql_to_odbc({error, MySQLRes}) -> mysql_to_odbc({error, MySQLRes}) ->
{error, mysql:get_result_reason(MySQLRes)}. {error, mysql:get_result_reason(MySQLRes)}.