Update of /cvsroot/monetdb/pathfinder/compiler/mil
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1187
Modified Files:
Tag: xrpcdemo
milprint_summer.c
Log Message:
- make updates work again
U milprint_summer.c
Index: milprint_summer.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/mil/milprint_summer.c,v
retrieving revision 1.419.4.10
retrieving revision 1.419.4.11
diff -u -d -r1.419.4.10 -r1.419.4.11
--- milprint_summer.c 10 Jun 2008 05:11:37 -0000 1.419.4.10
+++ milprint_summer.c 10 Jun 2008 10:06:25 -0000 1.419.4.11
@@ -11390,11 +11390,11 @@
"var tijah_lock := lock_nil; # pftijah collection lock\n"
#endif
#ifdef HAVE_PROBXML
- "module(\"probxml\");\n"
- "var newid_counter := 1LL;\n"
+ "module(\"probxml\");\n"
+ "var newid_counter := 1LL;\n"
#endif
#ifdef DO_PROFILE
- "var prof_fun_time := new(str,lng);\n"
+ "var prof_fun_time := new(str,lng);\n"
#endif
"\n"
"# value containers for literal values\n"
@@ -11504,7 +11504,7 @@
"time_print := 0LL;\n"\
"time_exec := 0LL;\n"\
"time_start := usec();\n"\
- "var try := 1;\n"
+ "var try := 2;\n"
#define PF_STARTMIL_NORMAL(STMT) PF_STARTMIL_START\
"var err := str_nil;\n"\
"{{var ws := empty_bat;\n"\
@@ -11513,7 +11513,7 @@
#define PF_STARTMIL_UPDATE PF_STARTMIL_START\
"var err := \"!ERROR: conflicting update\";\n"\
"var ws_log_wsid := 0LL;\n"\
- "{while(try <= 2) and not(isnil(err))) {\n"\
+ "{while((try <= 3) and not(isnil(err))) {\n"\
" if (not(err.startsWith(\"!ERROR: conflicting update\"))) break;\n"\
" var ws := empty_bat;\n"\
" err := CATCH({\n"\
-------------------------------------------------------------------------
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
