Changeset: 496cfb29b707 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/496cfb29b707
Modified Files:
clients/odbc/tests/ODBCtester.c
sql/test/emptydb/Tests/check.stable.out.32bit
Branch: Mar2025
Log Message:
32 bit fixes.
diffs (33 lines):
diff --git a/clients/odbc/tests/ODBCtester.c b/clients/odbc/tests/ODBCtester.c
--- a/clients/odbc/tests/ODBCtester.c
+++ b/clients/odbc/tests/ODBCtester.c
@@ -269,7 +269,7 @@ testGetDataGUID(SQLHANDLE stmt)
pos += snprintf(outp + pos, outp_len - pos, "NULL\n");
else
pos += snprintf(outp + pos, outp_len - pos,
"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
- guid_val.Data1, guid_val.Data2, guid_val.Data3,
+ (unsigned int) guid_val.Data1,
guid_val.Data2, guid_val.Data3,
guid_val.Data4[0], guid_val.Data4[1],
guid_val.Data4[2], guid_val.Data4[3], guid_val.Data4[4], guid_val.Data4[5],
guid_val.Data4[6], guid_val.Data4[7]);
check(ret, SQL_HANDLE_STMT, stmt, "SQLGetData(col)");
}
@@ -361,7 +361,7 @@ testGetDataIntervalDay(SQLHANDLE stmt, i
if (vallen == SQL_NULL_DATA)
pos += snprintf(outp + pos, outp_len - pos, "NULL\n");
else
- pos += snprintf(outp + pos, outp_len - pos, "%d (type
%d, sign %d)\n", itv_val.intval.day_second.day, itv_val.interval_type,
itv_val.interval_sign);
+ pos += snprintf(outp + pos, outp_len - pos, "%lu (type
%d, sign %d)\n", (unsigned long) itv_val.intval.day_second.day,
itv_val.interval_type, itv_val.interval_sign);
check(ret, SQL_HANDLE_STMT, stmt, "SQLGetData(col) as int");
}
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -2015,6 +2015,8 @@ select 'null in fkeys.delete_action', de
[ "sys.functions", "sys", "hostmask", "SYSTEM", "create
function \"hostmask\" (p inet) returns inet external name inet.\"hostmask\";",
"inet", "MAL", "Scalar function", false, false, false, true, NULL,
"result", "inet", 0, 0, "out", "p", "inet", 0, 0,
"in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL ]
[ "sys.functions", "sys", "hot_snapshot", "SYSTEM", "create
procedure sys.hot_snapshot(tarfile string) external name sql.hot_snapshot;",
"sql", "MAL", "Procedure", true, false, false, true, NULL,
"tarfile", "varchar", 0, 0, "in", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL ]
[ "sys.functions", "sys", "hot_snapshot", "SYSTEM", "create
procedure sys.hot_snapshot(tarfile string, onserver bool) external name
sql.hot_snapshot;", "sql", "MAL", "Procedure", true, false, false,
true, NULL, "tarfile", "varchar", 0, 0, "in",
"onserver", "boolean", 1, 0, "in", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
+[ "sys.functions", "sys", "hot_snapshot", "SYSTEM", "create
procedure sys.hot_snapshot(tarfile string, onserver bool, omitunlogged bool)
external name sql.hot_snapshot;", "sql", "MAL", "Procedure", true,
false, false, true, NULL, "tarfile", "varchar", 0, 0,
"in", "onserver", "boolean", 1, 0, "in", "omitunlogged",
"boolean", 1, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
+[ "sys.functions", "sys", "hot_snapshot", "SYSTEM", "create
procedure sys.hot_snapshot(tarfile string, onserver bool, omitunlogged bool,
omitids string) external name sql.hot_snapshot;", "sql", "MAL", "Procedure",
true, false, false, true, NULL, "tarfile", "varchar", 0,
0, "in", "onserver", "boolean", 1, 0, "in",
"omitunlogged", "boolean", 1, 0, "in", "omitids",
"varchar", 0, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "hour", "SYSTEM", "hours",
"mtime", "Internal C", "Scalar function", false, false, false,
false, NULL, "res_0", "int", 31, 0, "out", "arg_1",
"day_interval", 4, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "hour", "SYSTEM", "hours",
"mtime", "Internal C", "Scalar function", false, false, false,
false, NULL, "res_0", "int", 31, 0, "out", "arg_1",
"sec_interval", 13, 0, "in", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL ]
[ "sys.functions", "sys", "hour", "SYSTEM", "hours",
"mtime", "Internal C", "Scalar function", false, false, false,
false, NULL, "res_0", "tinyint", 7, 0, "out",
"arg_1", "time", 7, 0, "in", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL ]
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
