From e245e6e592849587d875dff19ed8c52676a5056c Mon Sep 17 00:00:00 2001 From: tim Date: Fri, 17 Jul 2015 22:18:26 +0300 Subject: [PATCH 1/2] it should work on OTP18 --- include/emysql.hrl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/emysql.hrl b/include/emysql.hrl index 1320289f..eabf87b7 100644 --- a/include/emysql.hrl +++ b/include/emysql.hrl @@ -34,9 +34,9 @@ port :: number(), database :: string(), encoding :: utf8 | latin1 | {utf8, utf8_unicode_ci} | {utf8, utf8_general_ci}, - available=queue:new() :: queue(), - locked=gb_trees:empty() :: gb_tree(), - waiting=queue:new() :: queue(), + available=queue:new() :: queue:queue(), + locked=gb_trees:empty() :: gb_trees:tree(), + waiting=queue:new() :: queue:queue(), start_cmds=[] :: string(), conn_test_period=0 :: number(), connect_timeout=infinity :: number() | infinity, From a5564d1a1c6592986ebe5a3d2374bd5256b7c61a Mon Sep 17 00:00:00 2001 From: tim Date: Fri, 17 Jul 2015 22:33:37 +0300 Subject: [PATCH 2/2] some fixes --- src/emysql.erl | 2 +- src/emysql_conn_mgr.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emysql.erl b/src/emysql.erl index a373de9a..40467869 100644 --- a/src/emysql.erl +++ b/src/emysql.erl @@ -669,7 +669,7 @@ result_type(#eof_packet{}) -> eof. -spec as_dict(Result) -> Dict when Result :: #result_packet{}, - Dict :: dict(). + Dict :: dict:dict(). as_dict(Res) -> emysql_conv:as_dict(Res). diff --git a/src/emysql_conn_mgr.erl b/src/emysql_conn_mgr.erl index b14a08d6..97536a06 100644 --- a/src/emysql_conn_mgr.erl +++ b/src/emysql_conn_mgr.erl @@ -40,7 +40,7 @@ -include("emysql.hrl"). --record(state, {pools, lockers = dict:new() :: dict()}). +-record(state, {pools, lockers = dict:new() :: dict:dict()}). %%==================================================================== %% API