Skip to content

ODBC Mars issues #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmcnabb-vms wants to merge 10 commits into
base: master
Choose a base branch
from
+139 −25
Open

ODBC Mars issues #690

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e782a89
ODBC MARS: Fix sliding window calculation
mmcnabb-vms Dec 23, 2025
675c58e
ODBC MARS: Extra debug logging
mmcnabb-vms Dec 23, 2025
138584b
ODBC MARS: Don't need to free MARS socket until statement free
mmcnabb-vms Dec 24, 2025
3ba42b5
ODBC Tests: option to suppress display of every command
mmcnabb-vms Dec 24, 2025
c309dfc
ODBC MARS: Expand the MARS1 test
mmcnabb-vms Dec 24, 2025
148c56b
ODBC MARS: Fix sliding window calculation (updated)
mmcnabb-vms Dec 29, 2025
533f6b4
ODBC MARS: Don't need to free MARS socket until statement free (updated)
mmcnabb-vms Dec 29, 2025
149edc9
Remove accidental debugging
mmcnabb-vms Dec 30, 2025
8f8e509
ODBC MARS test: Heap usage logging
mmcnabb-vms Dec 29, 2025
a18a448
Move declarations to top of function , for old compiler appveyor
mmcnabb-vms Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/odbc/odbc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,13 @@ odbc_lock_statement(TDS_STMT* stmt)

/* try with MARS */
if (!tds)
{
tds = tds_alloc_additional_socket(dbc_tds->conn);
if (tds)
{
tdsdump_log(TDS_DBG_INFO1, "MARS SID %d allocated new TDSSOCKET\n", tds->sid);
}
}
}
if (tds) {
tds->query_timeout = (stmt->attr.query_timeout != DEFAULT_QUERY_TIMEOUT) ?
Expand Down
7 changes: 7 additions & 0 deletions src/tds/packet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,13 @@ tds_read_packet(TDSSOCKET * tds)
return tds->in_len;
}

#if ENABLE_EXTRA_CHECKS
{
TDS_UINT np = 0;
for (p_packet = &conn->packets; *p_packet; p_packet = &(*p_packet)->next) ++np;
tdsdump_log(TDS_DBG_NETWORK, "MARS SID %d queued packets %u\n", tds->sid, np);
}
#endif
/* network ok ? process network */
if (!conn->in_net_tds) {
tds_connection_network(conn, tds, 0);
Expand Down