Changeset: c011edd2d77f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c011edd2d77f
Modified Files:
clients/mapilib/mapi.c
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:
Compilation fixes.
diffs (34 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4276,8 +4276,10 @@ read_into_cache(MapiHdl hdl, int lookahe
result->fields[i].converter =
(mapi_converter) mapi_convert_bigint;
} else if (strcasecmp(type_sql_name, "real") ==
0) {
result->fields[i].converter =
(mapi_converter) mapi_convert_real;
+#ifdef HAVE_HGE
} else if (strcasecmp(type_sql_name, "hugeint")
== 0) {
result->fields[i].converter =
(mapi_converter) mapi_convert_hugeint;
+#endif
} else if (strcasecmp(type_sql_name, "time") ==
0) {
result->fields[i].converter =
(mapi_converter) mapi_convert_time;
} else if (strcasecmp(type_sql_name,
"timestamp") == 0) {
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1819,7 +1819,7 @@ mvc_export_file(backend *b, stream *s, r
return res;
}
-static int write_str_term(stream* s, const str val) {
+static int write_str_term(stream* s, const char* const val) {
return mnstr_writeStr(s, val) && mnstr_writeBte(s, 0);
}
@@ -1852,7 +1852,6 @@ static int mvc_export_resultset_prot10(m
BATiter *iterators = NULL;
lng fixed_lengths = 0;
int fres = 0;
- column_compression colcomp = bs2_colcomp(s);
int VARCHAR_MAXIMUM_FIXED = 0;
if (GDKgetenv("varchar_maximum_fixed") != NULL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
