aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-09-02 10:04:45 +0200
committerIngela Anderton Andin <[email protected]>2011-09-02 10:04:45 +0200
commit025e5799c3204fbacb59340e752f9a72f75363bd (patch)
tree1e35170b9bdece70c14de78dcb13a6fc3e020505
parentd2bf3c02a0d4774043ce75dcb9cc96ebdd2a175c (diff)
parentcb2fd40dfbdd7554e5ea256e6ed8a6f3ef8425fe (diff)
downloadotp-025e5799c3204fbacb59340e752f9a72f75363bd.tar.gz
otp-025e5799c3204fbacb59340e752f9a72f75363bd.tar.bz2
otp-025e5799c3204fbacb59340e752f9a72f75363bd.zip
Merge branch 'dev' into major
* dev: When using output parameters the internal odbc state was not correctly cleaned causing the next call to param_query to missbehave.
-rw-r--r--lib/odbc/c_src/odbcserver.c1
-rw-r--r--lib/odbc/test/odbc_test_lib.erl9
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index 11e311d72d..ab2d7fe210 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -772,6 +772,7 @@ static db_result_msg db_param_query(byte *buffer, db_state *state)
}
associated_result_set(state) = FALSE;
param_query(state) = TRUE;
+ out_params(state) = FALSE;
msg = encode_empty_message();
diff --git a/lib/odbc/test/odbc_test_lib.erl b/lib/odbc/test/odbc_test_lib.erl
index 2d6bf5fcac..4d7d1ae2fa 100644
--- a/lib/odbc/test/odbc_test_lib.erl
+++ b/lib/odbc/test/odbc_test_lib.erl
@@ -97,10 +97,13 @@ linux_issue() ->
string:tokens(binary_to_list(Binary), " ").
is_sles11(IssueTokens) ->
- lists:member(11, IssueTokens).
+ lists:member("11", IssueTokens).
is_sles10(IssueTokens) ->
- lists:member(10, IssueTokens).
+ lists:member("10", IssueTokens).
is_sles9(IssueTokens) ->
- lists:member(9, IssueTokens).
+ lists:member("9", IssueTokens).
+
+is_ubuntu(IssueTokens) ->
+ lists:member("Ubuntu", IssueTokens).