diff options
| author | badlop <badlop@process-one.net> | 2020-12-04 13:48:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 13:48:13 +0100 |
| commit | e95ae66d3c12d722ed7245ff6ed1510b799a49b5 (patch) | |
| tree | e16a0e4d7e88a354773a75ae72d6334299b70aed /src | |
| parent | Simplify updating disk room options in set_room_affiliation (diff) | |
| parent | also convert embedded errors to binary (diff) | |
Merge pull request #3435 from fdie/fix_odbc_binary_errors
also convert embedded errors to binary
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_sql.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ejabberd_sql.erl b/src/ejabberd_sql.erl index 0fd338222..70d0eff09 100644 --- a/src/ejabberd_sql.erl +++ b/src/ejabberd_sql.erl @@ -1034,7 +1034,7 @@ mysql_to_odbc({error, MySQLRes}) when is_list(MySQLRes) -> {error, list_to_binary(MySQLRes)}; mysql_to_odbc({error, MySQLRes}) -> - {error, p1_mysql:get_result_reason(MySQLRes)}; + mysql_to_odbc({error, p1_mysql:get_result_reason(MySQLRes)}); mysql_to_odbc(ok) -> ok. |