Changeset: 1e43e354c3e7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e43e354c3e7 Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows Branch: default Log Message:
Merge with Aug2011 branch.
diffs (44 lines):
diff --git a/clients/mapiclient/Tests/msqldump--help.stable.err
b/clients/mapiclient/Tests/msqldump--help.stable.err
--- a/clients/mapiclient/Tests/msqldump--help.stable.err
+++ b/clients/mapiclient/Tests/msqldump--help.stable.err
@@ -6,11 +6,12 @@ stderr of test 'msqldump--help` in direc
# 16:36:12 >
-# 09:44:09 >
-# 09:44:09 > Mtimeout -timeout 60 msqldump --help
-# 09:44:09 >
+# 09:38:34 >
+# 09:38:34 > Mtimeout -timeout 60 msqldump --help
+# 09:38:34 >
-Usage: msqldump [ options ]
+Usage: msqldump [ options ] [ dbname ]
+
Options are:
-h hostname | --host=hostname host to connect to
-p portnr | --port=portnr port to connect to
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
@@ -4432,7 +4432,7 @@ end main;
[ "flt", "command", "calc", "(x:bte):flt
",
"CALCbte2flt;"
]
[ "flt", "command", "calc", "(x:dbl):flt
",
"CALCdbl2flt;"
]
[ "flt", "command", "calc", "(x:flt):flt
",
"CALCflt2flt;"
]
-[ "geometrycollection", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
+[ "geomcollection", "function", "calc", "(wkt:str):wkb;",
"nil" ]
[ "geometry", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "getBAT", "command", "calc",
"(b:BAT):bat[:any_1,:any_2] ",
"CALCbatid2bat;"
]
[ "getBATidentifier", "command", "calc",
"(b:bat[:any_1,:any_2]):BAT ",
"CALCbat2batid;"
]
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
@@ -4421,7 +4421,7 @@ end main;
[ "flt", "command", "calc", "(x:bte):flt
",
"CALCbte2flt;"
]
[ "flt", "command", "calc", "(x:dbl):flt
",
"CALCdbl2flt;"
]
[ "flt", "command", "calc", "(x:flt):flt
",
"CALCflt2flt;"
]
-[ "geometrycollection", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
+[ "geomcollection", "function", "calc", "(wkt:str):wkb;",
"nil" ]
[ "geometry", "function", "calc",
"(wkt:str):wkb;",
"nil" ]
[ "getBAT", "command", "calc",
"(b:BAT):bat[:any_1,:any_2] ",
"CALCbatid2bat;"
]
[ "getBATidentifier", "command", "calc",
"(b:bat[:any_1,:any_2]):BAT ",
"CALCbat2batid;"
]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
