diff options
| author | Micael Karlberg <[email protected]> | 2011-03-09 15:42:59 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-09 15:42:59 +0100 |
| commit | f8aac645c1c74626049b3a30eeedb6339cd43e2c (patch) | |
| tree | fcda8e85564df7a84808c77e58e893d943a298a9 /lib/odbc | |
| parent | 6c8f96a4a762e8bd9dd2ef758a5312791c064dd0 (diff) | |
| parent | 62e056af8c4fa058faa5087614c6b837a07f06e6 (diff) | |
| download | otp-f8aac645c1c74626049b3a30eeedb6339cd43e2c.tar.gz otp-f8aac645c1c74626049b3a30eeedb6339cd43e2c.tar.bz2 otp-f8aac645c1c74626049b3a30eeedb6339cd43e2c.zip | |
Merge branch 'dev' into bmk/snmp/support_ipv6_transport_address
Diffstat (limited to 'lib/odbc')
| -rw-r--r-- | lib/odbc/c_src/odbcserver.c | 4 | ||||
| -rw-r--r-- | lib/odbc/src/odbc.appup.src | 4 | ||||
| -rw-r--r-- | lib/odbc/vsn.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c index 077d78bfe5..d61ce940c3 100644 --- a/lib/odbc/c_src/odbcserver.c +++ b/lib/odbc/c_src/odbcserver.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1999-2010. All Rights Reserved. + * Copyright Ericsson AB 1999-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -472,7 +472,7 @@ static db_result_msg db_connect(byte *args, db_state *state) &stringlength2ptr, SQL_DRIVER_NOPROMPT); if (!sql_success(result)) { - diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state)); + diagnos = get_diagnos(SQL_HANDLE_DBC, connection_handle(state)); strcat((char *)diagnos.error_msg, " Connection to database failed."); msg = encode_error_message(diagnos.error_msg); diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src index f1a370d925..2a6667ccd3 100644 --- a/lib/odbc/src/odbc.appup.src +++ b/lib/odbc/src/odbc.appup.src @@ -1,8 +1,8 @@ %% -*- erlang -*- {"%VSN%", [ - {"2.10.8", [{restart_application, ssl}]} + {"2.10.9", [{restart_application, ssl}]} ], [ - {"2.10.8", [{restart_application, ssl}]} + {"2.10.9", [{restart_application, ssl}]} ]}. diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk index aacf3924db..42a51be33e 100644 --- a/lib/odbc/vsn.mk +++ b/lib/odbc/vsn.mk @@ -1 +1 @@ -ODBC_VSN = 2.10.9 +ODBC_VSN = 2.10.10 |