diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/odbc/ejabberd_odbc.erl | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -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> * src/ejabberd_s2s.erl: Added remove_connection/3 @@ -12,7 +17,7 @@ * src/mod_echo.erl: mod_echo does not reply to other 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 file. mod_echo is mainly a development/test module. 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)}. |