Update of /cvsroot/monetdb/pathfinder/compiler
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19290/compiler
Modified Files:
Tag: PF_ROX
compile.c main.c
Log Message:
propagated changes of Tuesday Jun 17 2008 - Thursday Jun 19 2008
from the development trunk to the PF_ROX branch
U compile.c
Index: compile.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/compile.c,v
retrieving revision 1.132.2.13
retrieving revision 1.132.2.14
diff -u -d -r1.132.2.13 -r1.132.2.14
--- compile.c 6 Jun 2008 14:25:30 -0000 1.132.2.13
+++ compile.c 19 Jun 2008 15:54:21 -0000 1.132.2.14
@@ -365,6 +365,9 @@
/* Initialize data structures in the QName department */
PFqname_init ();
+ /* Initialize the column name counter */
+ PFalg_init ();
+
if (status->import_xml_filename) {
/**
* If the input is explicitely specified with an filename,
@@ -595,7 +598,8 @@
goto bailout;
}
-
+ /* Initialize the column name counter */
+ PFalg_init ();
/*
* map core to algebra tree
U main.c
Index: main.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/main.c,v
retrieving revision 1.97.4.6
retrieving revision 1.97.4.7
diff -u -d -r1.97.4.6 -r1.97.4.7
--- main.c 17 Apr 2008 14:29:50 -0000 1.97.4.6
+++ main.c 19 Jun 2008 15:54:21 -0000 1.97.4.7
@@ -867,6 +867,10 @@
case 'b':
status->standoff_axis_steps = true;
+#if ALGEBRA_IS_DEFAULT
+ if (status->output_format == PFoutput_format_not_specified)
+ status->output_format = PFoutput_format_milprint_summer;
+#endif
break;
case 'c':
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
