Changeset: c5182afeeaf1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5182afeeaf1
Modified Files:
monetdb5/optimizer/opt_mergetable.c
tools/mserver/mserver5.c
Branch: Jun2016
Log Message:
merged
diffs (27 lines):
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -633,7 +633,8 @@ static int
subjoin_split(Client cntxt, InstrPtr p, int args)
{
char *name = NULL;
- int len, i, res = 0;
+ size_t len;
+ int i, res = 0;
Symbol sym;
MalBlkPtr mb;
InstrPtr q;
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -286,8 +286,10 @@ main(int argc, char **av)
_CrtSetReportMode(_CRT_ERROR, 0);
_CrtSetReportMode(_CRT_ASSERT, 0);
_set_invalid_parameter_handler(mserver_invalid_parameter_handler);
+#ifdef _TWO_DIGIT_EXPONENT
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
+#endif
if (setlocale(LC_CTYPE, "") == NULL) {
GDKfatal("cannot set locale\n");
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
