Changeset: 748a0cca567b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=748a0cca567b Modified Files: Branch: default Log Message:
Merge with Mar2011 branch.
diffs (179 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -141,31 +141,6 @@
[ "locate", "pattern", "tokenizer",
"(s:str):oid ",
"TKNZRlocate;"
]
[ "open", "command", "tokenizer",
"(name:str):void ",
"TKNZRopen;"
]
[ "take", "pattern", "tokenizer",
"(i:oid):str ",
"TKNZRtakeOid;"
]
-[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,b:bat[:oid,:any_1],tag:oid):ptr ",
"MASTERappend;"
]
-[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,_5:any_1,tag:oid):ptr ",
"MASTERappendValue;"
]
-[ "copy", "pattern", "master",
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,tag:oid):void
", "MASTERcopy;" ]
-[ "close", "command", "master",
"(tag:oid):void ",
"MASTERclose;"
]
-[ "delete", "pattern", "master",
"(s:str,t:str,b:bat[:oid,:any_1],tag:oid):void ",
"MASTERdelete;"
]
-[ "freeze", "command", "master", "():void ",
"MASTERfreeze;"
]
-[ "getCutOffTag", "command", "master", "():oid ",
"MASTERgetCutOffTag;"
]
-[ "getURI", "command", "master", "():str ",
"MASTERgetURI;"
]
-[ "open", "command", "master", "():oid ",
"MASTERopen;"
]
-[ "prelude", "command", "master",
"():void ",
"MASTERprelude;" ]
-[ "replay", "pattern", "master",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"MASTERreplay;"
]
-[ "sync", "command", "master",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"MASTERsync;"
]
-[ "stop", "command", "master",
"():void ",
"MASTERstop;"
]
-[ "start", "command", "master",
"():void ",
"MASTERstart;"
]
-[ "close", "command", "slave",
"(tag:oid,stamp:timestamp):void ",
"SLAVEclose;"
]
-[ "drop", "command", "slave",
"(fcnname:str):void ",
"SLAVEdrop;"
]
-[ "isprotected", "command", "slave",
"(schema:str,table:str):bit ",
"SLAVEisprotected;"
]
-[ "open", "pattern", "slave",
"(tag:oid):int ",
"SLAVEopen;"
]
-[ "prelude", "command", "slave",
"():void ",
"SLAVEprelude;"
]
-[ "protect", "command", "slave",
"(schema:str,table:str):void ",
"SLAVEprotect;"
]
-[ "synchronizing", "command", "slave", "():int ",
"SLAVEsynchronizing;"
]
-[ "stop", "command", "slave", "():void ",
"SLAVEstop;"
]
-[ "sync", "command", "slave",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"SLAVEsync;"
]
-[ "sync", "command", "slave",
"(uri:str):void ",
"SLAVEsyncURI;"
]
-[ "sync", "command", "slave",
"():void ",
"SLAVEsyncDefault;" ]
[ "editdistance2", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic2_impl;" ]
[ "editdistance", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic_impl;" ]
[ "levenshtein", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic_impl;" ]
@@ -241,7 +216,6 @@
[ "dec_round", "command", "sql",
"(v:int,r:int):int ",
"int_dec_round_wrap;" ]
[ "dec_round", "command", "sql",
"(v:sht,r:sht):sht ",
"sht_dec_round_wrap;" ]
[ "dec_round", "command", "sql",
"(v:bte,r:bte):bte ",
"bte_dec_round_wrap;" ]
-[ "dump_slave", "pattern", "sql",
"():bat[:str,:BAT] ",
"dump_slave;" ]
[ "dump_trace", "pattern", "sql",
"():bat[:str,:BAT] ",
"dump_trace;" ]
[ "dump_opt_stats", "pattern", "sql",
"():bat[:str,:BAT] ",
"dump_opt_stats;" ]
[ "dump_cache", "pattern", "sql",
"():bat[:str,:BAT] ",
"dump_cache;" ]
@@ -418,8 +392,6 @@
[ "remoteQueries", "pattern", "optimizer", "():str ",
"OPTremoteQueries;"
]
[ "recycle", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTrecycle;"
]
[ "recycle", "pattern", "optimizer", "():str ",
"OPTrecycle;"
]
-[ "replication", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTreplication;"
]
-[ "replication", "pattern", "optimizer", "():str ",
"OPTreplication;"
]
[ "remap", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTremap;"
]
[ "remap", "pattern", "optimizer", "():str ",
"OPTremap;"
]
[ "reduce", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTreduce;"
]
@@ -4703,7 +4675,6 @@
[ "multipoint", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "mbr", "command", "calc", "(v:mbr):mbr
",
"mbrFromMBR;" ]
[ "mbr", "command", "calc", "(v:str):mbr
",
"mbrFromString;" ]
-[ "month_interval", "command", "calc",
"(v:daytime,ek:int,sk:int):int ",
"month_interval_daytime;" ]
[ "month_interval", "command", "calc",
"(v:lng,ek:int,sk:int):int ",
"month_interval_lng;" ]
[ "month_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):int ",
"month_interval_wrd;" ]
[ "month_interval", "command", "calc",
"(v:int,ek:int,sk:int):int ",
"month_interval_int;" ]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Debian
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Debian
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Debian
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Debian
@@ -890,31 +890,6 @@
[ "encode", "command", "zorder",
"(x:int,y:int):oid ",
"ZORDencode_int_oid;"
]
[ "slice", "command", "zorder",
"(xb:int,yb:int,xt:int,yt:int):bat[:oid,:oid] ",
"ZORDslice_int;"
]
[ "sql_slice", "command", "zorder",
"(xb:int,yb:int,xt:int,yt:int):bat[:str,:BAT] ",
"ZORDsql_slice_int;"
]
-[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,b:bat[:oid,:any_1],tag:oid):ptr ",
"MASTERappend;"
]
-[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,_5:any_1,tag:oid):ptr ",
"MASTERappendValue;"
]
-[ "copy", "pattern", "master",
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,tag:oid):void
", "MASTERcopy;" ]
-[ "close", "command", "master",
"(tag:oid):void ",
"MASTERclose;"
]
-[ "delete", "pattern", "master",
"(s:str,t:str,b:bat[:oid,:any_1],tag:oid):void ",
"MASTERdelete;"
]
-[ "freeze", "command", "master", "():void ",
"MASTERfreeze;"
]
-[ "getCutOffTag", "command", "master", "():oid ",
"MASTERgetCutOffTag;"
]
-[ "getURI", "command", "master", "():str ",
"MASTERgetURI;" ]
-[ "open", "command", "master", "():oid ",
"MASTERopen;"
]
-[ "prelude", "command", "master",
"():void ",
"MASTERprelude;" ]
-[ "replay", "pattern", "master",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"MASTERreplay;"
]
-[ "sync", "command", "master",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"MASTERsync;"
]
-[ "stop", "command", "master",
"():void ",
"MASTERstop;"
]
-[ "start", "command", "master",
"():void ",
"MASTERstart;"
]
-[ "close", "command", "slave",
"(tag:oid,stamp:timestamp):void ",
"SLAVEclose;"
]
-[ "drop", "command", "slave",
"(fcnname:str):void ",
"SLAVEdrop;"
]
-[ "isprotected", "command", "slave",
"(schema:str,table:str):bit ",
"SLAVEisprotected;"
]
-[ "open", "pattern", "slave",
"(tag:oid):int ",
"SLAVEopen;"
]
-[ "prelude", "command", "slave",
"():void ",
"SLAVEprelude;"
]
-[ "protect", "command", "slave",
"(schema:str,table:str):void ",
"SLAVEprotect;"
]
-[ "synchronizing", "command", "slave", "():int ",
"SLAVEsynchronizing;"
]
-[ "stop", "command", "slave", "():void ",
"SLAVEstop;"
]
-[ "sync", "command", "slave",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"SLAVEsync;"
]
-[ "sync", "command", "slave",
"(uri:str):void ",
"SLAVEsyncURI;"
]
-[ "sync", "command", "slave",
"():void ",
"SLAVEsyncDefault;" ]
[ "editdistance2", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic2_impl;" ]
[ "editdistance", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic_impl;" ]
[ "levenshtein", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic_impl;" ]
@@ -1052,8 +1027,6 @@
[ "remoteQueries", "pattern", "optimizer", "():str ",
"OPTremoteQueries;"
]
[ "recycle", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTrecycle;"
]
[ "recycle", "pattern", "optimizer", "():str ",
"OPTrecycle;"
]
-[ "replication", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTreplication;"
]
-[ "replication", "pattern", "optimizer", "():str ",
"OPTreplication;"
]
[ "remap", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTremap;"
]
[ "remap", "pattern", "optimizer", "():str ",
"OPTremap;"
]
[ "reduce", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTreduce;"
]
@@ -5269,7 +5242,6 @@
[ "multipoint", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "mbr", "command", "calc", "(v:mbr):mbr
",
"mbrFromMBR;" ]
[ "mbr", "command", "calc", "(v:str):mbr
",
"mbrFromString;" ]
-[ "month_interval", "command", "calc",
"(v:daytime,ek:int,sk:int):int ",
"month_interval_daytime;" ]
[ "month_interval", "command", "calc",
"(v:lng,ek:int,sk:int):int ",
"month_interval_lng;" ]
[ "month_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):int ",
"month_interval_wrd;" ]
[ "month_interval", "command", "calc",
"(v:int,ek:int,sk:int):int ",
"month_interval_int;" ]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -890,31 +890,6 @@
[ "encode", "command", "zorder",
"(x:int,y:int):oid ",
"ZORDencode_int_oid;"
]
[ "slice", "command", "zorder",
"(xb:int,yb:int,xt:int,yt:int):bat[:oid,:oid] ",
"ZORDslice_int;"
]
[ "sql_slice", "command", "zorder",
"(xb:int,yb:int,xt:int,yt:int):bat[:str,:BAT] ",
"ZORDsql_slice_int;"
]
-[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,b:bat[:oid,:any_1],tag:oid):ptr ",
"MASTERappend;"
]
-[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,_5:any_1,tag:oid):ptr ",
"MASTERappendValue;"
]
-[ "copy", "pattern", "master",
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,tag:oid):void
", "MASTERcopy;" ]
-[ "close", "command", "master",
"(tag:oid):void ",
"MASTERclose;"
]
-[ "delete", "pattern", "master",
"(s:str,t:str,b:bat[:oid,:any_1],tag:oid):void ",
"MASTERdelete;"
]
-[ "freeze", "command", "master", "():void ",
"MASTERfreeze;"
]
-[ "getCutOffTag", "command", "master", "():oid ",
"MASTERgetCutOffTag;"
]
-[ "getURI", "command", "master", "():str ",
"MASTERgetURI;" ]
-[ "open", "command", "master", "():oid ",
"MASTERopen;"
]
-[ "prelude", "command", "master",
"():void ",
"MASTERprelude;" ]
-[ "replay", "pattern", "master",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"MASTERreplay;"
]
-[ "sync", "command", "master",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"MASTERsync;"
]
-[ "stop", "command", "master",
"():void ",
"MASTERstop;"
]
-[ "start", "command", "master",
"():void ",
"MASTERstart;"
]
-[ "close", "command", "slave",
"(tag:oid,stamp:timestamp):void ",
"SLAVEclose;"
]
-[ "drop", "command", "slave",
"(fcnname:str):void ",
"SLAVEdrop;"
]
-[ "isprotected", "command", "slave",
"(schema:str,table:str):bit ",
"SLAVEisprotected;"
]
-[ "open", "pattern", "slave",
"(tag:oid):int ",
"SLAVEopen;"
]
-[ "prelude", "command", "slave",
"():void ",
"SLAVEprelude;"
]
-[ "protect", "command", "slave",
"(schema:str,table:str):void ",
"SLAVEprotect;"
]
-[ "synchronizing", "command", "slave", "():int ",
"SLAVEsynchronizing;"
]
-[ "stop", "command", "slave", "():void ",
"SLAVEstop;"
]
-[ "sync", "command", "slave",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"SLAVEsync;"
]
-[ "sync", "command", "slave",
"(uri:str):void ",
"SLAVEsyncURI;"
]
-[ "sync", "command", "slave",
"():void ",
"SLAVEsyncDefault;" ]
[ "editdistance2", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic2_impl;" ]
[ "editdistance", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic_impl;" ]
[ "levenshtein", "command", "txtsim",
"(s:str,t:str):int ",
"levenshteinbasic_impl;" ]
@@ -1052,8 +1027,6 @@
[ "remoteQueries", "pattern", "optimizer", "():str ",
"OPTremoteQueries;"
]
[ "recycle", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTrecycle;"
]
[ "recycle", "pattern", "optimizer", "():str ",
"OPTrecycle;"
]
-[ "replication", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTreplication;"
]
-[ "replication", "pattern", "optimizer", "():str ",
"OPTreplication;"
]
[ "remap", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTremap;"
]
[ "remap", "pattern", "optimizer", "():str ",
"OPTremap;"
]
[ "reduce", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTreduce;"
]
@@ -5269,7 +5242,6 @@
[ "multipoint", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "mbr", "command", "calc", "(v:mbr):mbr
",
"mbrFromMBR;" ]
[ "mbr", "command", "calc", "(v:str):mbr
",
"mbrFromString;" ]
-[ "month_interval", "command", "calc",
"(v:daytime,ek:int,sk:int):int ",
"month_interval_daytime;" ]
[ "month_interval", "command", "calc",
"(v:lng,ek:int,sk:int):int ",
"month_interval_lng;" ]
[ "month_interval", "command", "calc",
"(v:wrd,ek:int,sk:int):int ",
"month_interval_wrd;" ]
[ "month_interval", "command", "calc",
"(v:int,ek:int,sk:int):int ",
"month_interval_int;" ]
diff --git a/monetdb5/modules/mal/mal_mapi.mx b/monetdb5/modules/mal/mal_mapi.mx
--- a/monetdb5/modules/mal/mal_mapi.mx
+++ b/monetdb5/modules/mal/mal_mapi.mx
@@ -706,7 +706,10 @@
maxusers = (maxusers ? maxusers : SERVERMAXUSERS);
if (port <= 0 && usockfile == NULL)
- throw(IO, "mal_mapi.listen", OPERATION_FAILED ": no port or
socket file specified");
+ throw(ILLARG, "mal_mapi.listen", OPERATION_FAILED ": no port or
socket file specified");
+
+ if (port > 65535)
+ throw(ILLARG, "mal_mapi.listen", OPERATION_FAILED ": port
number should be between 1 and 65535");
if (port > 0) {
sock = socket(AF_INET, SOCK_STREAM, 0);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
