diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-08 10:19:48 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-08 10:19:48 +0100 |
| commit | f18ee5fef2c80b4fd51d7d6ac30facaf55920a3d (patch) | |
| tree | 4a40040d14bafc6280294e824a5956f009a1d962 /lib | |
| parent | 6257d0eb9eb8485c31b41b9e07bfe398ee17f8a4 (diff) | |
| parent | f375225cf285b44b42f2992dcc95080afc937a41 (diff) | |
| download | otp-f18ee5fef2c80b4fd51d7d6ac30facaf55920a3d.tar.gz otp-f18ee5fef2c80b4fd51d7d6ac30facaf55920a3d.tar.bz2 otp-f18ee5fef2c80b4fd51d7d6ac30facaf55920a3d.zip | |
Merge branch 'ia/odbc/prepare-release-and-bettre-error-msg/OTP-9111' into dev
* ia/odbc/prepare-release-and-bettre-error-msg/OTP-9111:
Prepare relese and improved error messages OTP-9111
Diffstat (limited to 'lib')
| -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 |