Changeset: 474efc28f8b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=474efc28f8b8
Modified Files:
Branch: default
Log Message:
Merged from Apr2011
diffs (185 lines):
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -18,13 +18,13 @@
rem vaults is not (yet?) built on Windows
rem if not exist "%buildbase%\sql\backends\monet5\vaults\autoload" mkdir
"%buildbase%\sql\backends\monet5\vaults\autoload"
rem copy /y "%srcdir%"\sql\backends\monet5\vaults\??_*.mal
"%buildbase%\sql\backends\monet5\vaults\autoload"
-rem if "@HAVE_MSEED_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
-rem if "@HAVE_CFITSIO_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
+rem if "@HAVE_MSEED_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
+rem if "@HAVE_CFITSIO_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
REM enable auto-loading of SQL createdb scripts before `make install`
if not exist "%buildbase%\sql\sql\createdb" mkdir
"%buildbase%\sql\sql\createdb"
copy /y "%srcdir%"\sql\sql\??_*.sql "%buildbase%\sql\sql\createdb"
-if "@HAVE_RAPTOR_FALSE@"=="" del /y "%buildbase%\sql\sql\createdb\30_rdf.sql"
+if "@HAVE_RAPTOR_FALSE@"=="" del /f "%buildbase%\sql\sql\createdb\30_rdf.sql"
copy /y "%srcdir%"\geom\monetdb5\??_*.mal
"%buildbase%\sql\backends\monet5\autoload"
copy /y "%srcdir%"\geom\sql\??_*.sql "%buildbase%\sql\sql\createdb"
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -18,13 +18,13 @@
rem vaults is not (yet?) built on Windows
rem if not exist "%buildbase%\sql\backends\monet5\vaults\autoload" mkdir
"%buildbase%\sql\backends\monet5\vaults\autoload"
rem copy /y "%srcdir%"\sql\backends\monet5\vaults\??_*.mal
"%buildbase%\sql\backends\monet5\vaults\autoload"
-rem if "@HAVE_MSEED_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
-rem if "@HAVE_CFITSIO_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
+rem if "@HAVE_MSEED_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
+rem if "@HAVE_CFITSIO_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
REM enable auto-loading of SQL createdb scripts before `make install`
if not exist "%buildbase%\sql\sql\createdb" mkdir
"%buildbase%\sql\sql\createdb"
copy /y "%srcdir%"\sql\sql\??_*.sql "%buildbase%\sql\sql\createdb"
-if "@HAVE_RAPTOR_FALSE@"=="" del /y "%buildbase%\sql\sql\createdb\30_rdf.sql"
+if "@HAVE_RAPTOR_FALSE@"=="" del /f "%buildbase%\sql\sql\createdb\30_rdf.sql"
rem binaries (.exe)
set PATH=%buildbase%\clients\examples\C;%PATH%
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -18,13 +18,13 @@
rem vaults is not (yet?) built on Windows
rem if not exist "%buildbase%\sql\backends\monet5\vaults\autoload" mkdir
"%buildbase%\sql\backends\monet5\vaults\autoload"
rem copy /y "%srcdir%"\sql\backends\monet5\vaults\??_*.mal
"%buildbase%\sql\backends\monet5\vaults\autoload"
-rem if "@HAVE_MSEED_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
-rem if "@HAVE_CFITSIO_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
+rem if "@HAVE_MSEED_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
+rem if "@HAVE_CFITSIO_FALSE@"=="" del /f
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
REM enable auto-loading of SQL createdb scripts before `make install`
if not exist "%buildbase%\sql\sql\createdb" mkdir
"%buildbase%\sql\sql\createdb"
copy /y "%srcdir%"\sql\sql\??_*.sql "%buildbase%\sql\sql\createdb"
-if "@HAVE_RAPTOR_FALSE@"=="" del /y "%buildbase%\sql\sql\createdb\30_rdf.sql"
+if "@HAVE_RAPTOR_FALSE@"=="" del /f "%buildbase%\sql\sql\createdb\30_rdf.sql"
rem binaries (.exe)
set PATH=%buildbase%\clients\examples\C;%PATH%
diff --git a/sql/test/Tests/mclient-t-s.stable.err.Windows
b/sql/test/Tests/mclient-t-s.stable.err.Windows
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/mclient-t-s.stable.err.Windows
@@ -0,0 +1,108 @@
+stderr of test 'mclient-t-s` in directory 'test` itself:
+
+
+# 19:27:54 >
+# 19:27:54 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37077 --set
xrpc_port=45451 --set monet_prompt= --trace "--dbname=mTests_src_test" --set
mal_listing=0 "--dbinit= inc
lude sql;" ; echo ; echo Over..
+# 19:27:54 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.34.0
+# builtin opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = tst
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt gdk_debug = 8
+# builtin opt gdk_alloc_map = yes
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib64/MonetDB
+# builtin opt monet_daemon = yes
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_noheaders = no
+# builtin opt mapi_debug = 0
+# builtin opt mapi_clients = 2
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt gdk_dbname = demo
+# config opt gdk_alloc_map = no
+# config opt gdk_embedded = no
+# config opt gdk_debug = 0
+# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin
+# config opt monet_daemon = no
+# config opt monet_welcome = yes
+# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt mal_init = ${exec_prefix}/lib64/MonetDB5/mal_init.mal
+# config opt mal_listing = 2
+# config opt mapi_port = 50000
+# config opt mapi_autosense = false
+# config opt mapi_open = false
+# config opt sql_optimizer = default_pipe
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,garbageCollector,dataflow,history,multiplex
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,garbageCollector,dataflow,history,multiplex
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,mitosis,aliases,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# cmdline opt config =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 37077
+# cmdline opt xrpc_port = 45451
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbname = mTests_src_test
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see
/ufs/manegold/_/scratch0/Monet/Testing/Candidate/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf)
+
+# 11:08:32 >
+# 11:08:32 > /usr/bin/python mclient-t-s.SQL.py mclient-t-s
+# 11:08:32 >
+
+mclient: invalid option -- 't'
+Usage: mclient [ options ]
+
+Options are:
+ -h hostname | --host=hostname host to connect to
+ -p portnr | --port=portnr port to connect to
+ -u user | --user=user user id
+ -d database | --database=database database to connect to
+ -e | --echo echo the query
+ -E charset | --encoding=charset specify encoding (character set) of the
terminal
+ -f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
+ -H | --history load/save cmdline history (default off)
+ -i | --interactive read stdin after command line args
+ -l language | --language=lang {sql,mal}
+ -L logfile | --log=logfile save client/server interaction
+ -s stmt | --statement=stmt run single statement
+ -X | --Xdebug trace mapi network interaction
+ -? | --help show this usage message
+
+SQL specific opions
+ -n nullstr | --null=nullstr change NULL representation for sql, csv and
tab output modes
+ -r nr | --rows=nr for pagination
+ -w nr | --width=nr for pagination
+ -D | --dump create an SQL dump
+ -N | --inserts use INSERT INTO statements when dumping
+
+# 11:08:32 >
+# 11:08:32 > Done.
+# 11:08:32 >
+
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -137,7 +137,7 @@
r'^(!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n',
# 25: 3
# r'^(ERROR = !sql_stmt symbol\()(.*)(\)->token = CREATE_SCHEMA)\n',
# 26: 3
r'^(ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo
failed: )(No .* is|.* not)( known[\. ]*)\n', # 27: 3
- r'^(/.*/lt-|)([A-Za-z0-9_]+: .*)\n',
# 28: 2
+ r'^(/.*/\.libs/|/.*/lt-|)([A-Za-z0-9_]+: .*)\n',
# 28: 2
# r'^(ERROR =| )( !ERROR: | !SQLException:assert:| !SQLException:sql:
| !SQLException:| !MALException:)([^:]+)(: *)([^ ].*)\n', # 90: 5
r'^(.*: at )(\([0-9]+,[0-9]+\-[0-9]+,[0-9]+\))(: .*)\n',
# 91: 3
# r'^(fatal error|ERROR)(: err:FORG0005, fn:exactly-one called with a
sequence containing zero or more than one item..*)()\n', # 99: 3
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
