diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-06-16 11:50:31 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-06-16 11:50:31 +0200 |
| commit | 1ef158b055f72288fe9d8a196d874b1310cbf342 (patch) | |
| tree | c964857ac8187ab0a01ad39626f722f44868e765 /lib/odbc/c_src/odbcserver.c | |
| parent | 479833a852a79ada3a6badb2c3feb3bb9cee19b8 (diff) | |
| parent | a70ee114820dd3922f3049e93981bc326af1863a (diff) | |
| download | otp-1ef158b055f72288fe9d8a196d874b1310cbf342.tar.gz otp-1ef158b055f72288fe9d8a196d874b1310cbf342.tar.bz2 otp-1ef158b055f72288fe9d8a196d874b1310cbf342.zip | |
Merge branch 'ia/odbc/mysql' into major
* ia/odbc/mysql:
Test odbc with MySQL
Diffstat (limited to 'lib/odbc/c_src/odbcserver.c')
| -rw-r--r-- | lib/odbc/c_src/odbcserver.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c index d61ce940c3..fb3c753450 100644 --- a/lib/odbc/c_src/odbcserver.c +++ b/lib/odbc/c_src/odbcserver.c @@ -1002,12 +1002,16 @@ static db_result_msg encode_result(db_state *state) db_result_msg msg; int elements, update, num_of_rows = 0; char *atom; + diagnos diagnos; msg = encode_empty_message(); if(!sql_success(SQLNumResultCols(statement_handle(state), &num_of_columns))) { - DO_EXIT(EXIT_COLS); + diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state)); + msg = encode_error_message(diagnos.error_msg); + clean_state(state); + return msg; } if (num_of_columns == 0) { @@ -1021,7 +1025,10 @@ static db_result_msg encode_result(db_state *state) } if(!sql_success(SQLRowCount(statement_handle(state), &RowCountPtr))) { - DO_EXIT(EXIT_ROWS); + diagnos = get_diagnos(SQL_HANDLE_STMT, statement_handle(state)); + msg = encode_error_message(diagnos.error_msg); + clean_state(state); + return msg; } if(param_query(state) && update) { |