Changeset: bb8eccd99142 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bb8eccd99142
Branch: default
Log Message:
merge with Mar2025
diffs (48 lines):
diff --git a/clients/odbc/driver/ODBCStmt.c b/clients/odbc/driver/ODBCStmt.c
--- a/clients/odbc/driver/ODBCStmt.c
+++ b/clients/odbc/driver/ODBCStmt.c
@@ -130,10 +130,10 @@ int
isValidStmt(ODBCStmt *stmt)
{
#ifdef ODBCDEBUG
- if (!(stmt &&stmt->Type == ODBC_STMT_MAGIC_NR))
+ if (!(stmt && stmt->Type == ODBC_STMT_MAGIC_NR))
ODBCLOG("stmt %p not a valid statement handle\n", stmt);
#endif
- return stmt &&stmt->Type == ODBC_STMT_MAGIC_NR;
+ return stmt && stmt->Type == ODBC_STMT_MAGIC_NR;
}
diff --git a/clients/odbc/driver/SQLExecute.c b/clients/odbc/driver/SQLExecute.c
--- a/clients/odbc/driver/SQLExecute.c
+++ b/clients/odbc/driver/SQLExecute.c
@@ -222,7 +222,11 @@ ODBCInitResult(ODBCStmt *stmt)
goto nomem;
} else {
rec->sql_desc_unnamed = SQL_UNNAMED;
+ if (rec->sql_desc_label)
+ free(rec->sql_desc_label);
rec->sql_desc_label = NULL;
+ if (rec->sql_desc_name)
+ free(rec->sql_desc_name);
rec->sql_desc_name = NULL;
}
if (rec->sql_desc_base_column_name)
diff --git a/clients/odbc/driver/SQLPrepare.c b/clients/odbc/driver/SQLPrepare.c
--- a/clients/odbc/driver/SQLPrepare.c
+++ b/clients/odbc/driver/SQLPrepare.c
@@ -299,13 +299,11 @@ MNDBPrepare(ODBCStmt *stmt,
/* unused fields */
rec->sql_desc_auto_unique_value = SQL_FALSE;
rec->sql_desc_data_ptr = NULL;
- rec->sql_desc_display_size = 0;
rec->sql_desc_indicator_ptr = NULL;
rec->sql_desc_literal_prefix = NULL;
rec->sql_desc_literal_suffix = NULL;
rec->sql_desc_octet_length_ptr = NULL;
rec->sql_desc_catalog_name = NULL;
- rec->sql_desc_schema_name = NULL;
rec->sql_desc_updatable = SQL_ATTR_READONLY;
/* this must come after other fields have been
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
