aboutsummaryrefslogtreecommitdiffstats
path: root/lib/odbc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-01-08 15:35:54 +0100
committerIngela Anderton Andin <[email protected]>2019-01-08 15:35:54 +0100
commitc31ebd0ec2025208fb9a25248ec1c41d101cb74e (patch)
tree4a87ccbb9abf67dc1dee20dcaff436c80200d5f3 /lib/odbc
parentf20807ff46a9d83b54a3c3cd0c0f5fb2c7e17ffb (diff)
parentf08e779f236dc9f5c9760f9630233154cdab0367 (diff)
downloadotp-c31ebd0ec2025208fb9a25248ec1c41d101cb74e.tar.gz
otp-c31ebd0ec2025208fb9a25248ec1c41d101cb74e.tar.bz2
otp-c31ebd0ec2025208fb9a25248ec1c41d101cb74e.zip
Merge branch 'maint'
Diffstat (limited to 'lib/odbc')
-rw-r--r--lib/odbc/c_src/odbcserver.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index 8c799f6ff1..fb4f61417e 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -2749,6 +2749,11 @@ static diagnos get_diagnos(SQLSMALLINT handleType, SQLHANDLE handle, Boolean ext
errmsg_buffer_size = errmsg_buffer_size - errmsg_size;
acc_errmsg_size = acc_errmsg_size + errmsg_size;
current_errmsg_pos = current_errmsg_pos + errmsg_size;
+ } else if(result == SQL_SUCCESS_WITH_INFO && errmsg_size >= errmsg_buffer_size) {
+ memcpy(diagnos.sqlState, current_sql_state, SQL_STATE_SIZE);
+ diagnos.nativeError = nativeError;
+ acc_errmsg_size = errmsg_buffer_size;
+ break;
} else {
break;
}