Changeset: aabd011085e4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aabd011085e4 Added Files: clients/mapilib/mapi_prompt.h clients/mapilib/mapi_querytype.h sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_26.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_27.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_29.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_30.sql sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.sql sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.sql sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.sql sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.sql sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.sql sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.stable.err sql/test/BugTracker-2020/Tests/ifthenelse-crash.Bug-6815.stable.out Removed Files: clients/mapiclient/Tests/tachograph--help clients/mapiclient/Tests/tachograph--help.bat clients/mapiclient/Tests/tachograph--help.stable.err clients/mapiclient/Tests/tachograph--help.stable.out clients/mapiclient/Tests/tomograph--help clients/mapiclient/Tests/tomograph--help.bat clients/mapiclient/Tests/tomograph--help.stable.err clients/mapiclient/Tests/tomograph--help.stable.out clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c debian/monetdb-client-tools.docs debian/monetdb-client-tools.install sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_15.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_26.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_27.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_28.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_29.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_30.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_31.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_31.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_31.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_32.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_02.sql.src sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_05.sql.src sql/include/sql_querytype.h tools/mserver/tomographintro.docx tools/mserver/tomographintro.pdf Modified Files: MonetDB.spec NT/monetdb_config.h.in clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/Makefile.ag clients/mapiclient/Tests/All clients/mapiclient/Tests/stethoscope--help.stable.err clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/stethoscope.c clients/mapilib/Makefile.ag clients/mapilib/mapi.c clients/mapilib/mapi.h debian/control debian/libmonetdb-client-dev.install debian/libmonetdb19.install gdk/gdk_batop.c gdk/gdk_hash.h gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_string.c gdk/gdk_tracer.c gdk/gdk_tracer.h monetdb5/extras/rapi/Makefile.ag monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_profiler.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/profiler.mal monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tracer.c monetdb5/modules/mal/wlc.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h sql/backends/monet5/Makefile.ag sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out sql/backends/monet5/UDF/udf/Makefile.ag sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/vaults/fits/Makefile.ag sql/backends/monet5/vaults/lidar/Makefile.ag sql/backends/monet5/vaults/netcdf/Makefile.ag sql/backends/monet5/vaults/shp/Makefile.ag sql/backends/monet5/vaults/shp/shp.c sql/benchmarks/arno/Tests/inserts.options5 sql/benchmarks/arno/Tests/inserts.reqtests sql/common/Makefile.ag sql/include/Makefile.ag sql/include/sql_catalog.h sql/jdbc/tests/Tests/Bug_IsValid_Timeout_Bug_6782.stable.out sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_propagate.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_qc.c sql/server/sql_qc.h sql/server/sql_scan.c sql/server/sql_semantic.c sql/storage/Makefile.ag sql/storage/bat/Makefile.ag sql/storage/bat/bat_logger.c sql/storage/bat/res_table.c sql/storage/sql_storage.h sql/test/BugDay_2005-12-19_2.9.3/Tests/bogus_prepare.SF-1377079.stable.err sql/test/BugDay_2005-12-19_2.9.3/Tests/prepare-where.SF-1238867.1238959.1238965.1240124.stable.err sql/test/BugTracker-2017/Tests/wrong_aggregation_count.Bug-6257.stable.out sql/test/BugTracker-2019/Tests/alter_table_set_schema.Bug-6701.stable.out sql/test/BugTracker-2019/Tests/avg-changes-value-scale.Bug-6783.stable.out sql/test/BugTracker-2019/Tests/index-insert-crash.Bug-6781.stable.out sql/test/BugTracker-2020/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/miscellaneous/Tests/groupby_error.sql sql/test/miscellaneous/Tests/groupby_error.stable.err sql/test/miscellaneous/Tests/groupby_error.stable.out sql/test/scanner/Tests/raw_strings.stable.err sql/test/scanner/Tests/raw_strings.stable.out sql/test/subquery/Tests/subquery3.sql sql/test/subquery/Tests/subquery3.stable.err sql/test/subquery/Tests/subquery3.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/wlcr/Tests/wlr110.py sql/test/wlcr/Tests/wlr35.py tools/mserver/Makefile.ag Branch: mosaic Log Message:
Merge with default. diffs (truncated from 198305 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -75,9 +75,9 @@ %bcond_without rintegration %endif -%if %{?rhel:0}%{!?rhel:1} -# On RHEL 6, Python 3 is too old, and on RHEL 7, the default Python 3 -# is too old (in both cases 3.4). +%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 +# On RHEL 6, Python 3 is too old. On RHEL 7, Python 3 was too old +# when RHEL 7 was released, but now it is ok. %bcond_without py3integration %endif @@ -266,34 +266,6 @@ MonetDB, you will very likely need this %doc %{_mandir}/man1/mclient.1.gz %doc %{_mandir}/man1/msqldump.1.gz -%package client-tools -Summary: MonetDB - Monet Database Management System Client Programs -Group: Applications/Databases -Requires: %{name}-client%{?_isa} = %{version}-%{release} -%if (0%{?fedora} >= 22) -# tomograph executes these two: -Recommends: /usr/bin/gs -Recommends: /usr/bin/gnuplot -%endif - -%description client-tools -MonetDB is a database management system that is developed from a -main-memory perspective with use of a fully decomposed storage model, -automatic index management, extensibility of data types and search -accelerators. It also has an SQL front end. - -This package contains stethoscope, tomograph, and tachograph. These -tools can be used to monitor the MonetDB database server. - -%files client-tools -%defattr(-,root,root) -%{_bindir}/stethoscope -%{_bindir}/tachograph -%{_bindir}/tomograph -%dir %{_datadir}/doc/MonetDB-client-tools -%docdir %{_datadir}/doc/MonetDB-client-tools -%{_datadir}/doc/MonetDB-client-tools/* - %package client-devel Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases @@ -314,7 +286,7 @@ This package contains the files needed t %defattr(-,root,root) %dir %{_includedir}/monetdb %{_libdir}/libmapi.so -%{_includedir}/monetdb/mapi.h +%{_includedir}/monetdb/mapi*.h %{_libdir}/pkgconfig/monetdb-mapi.pc %package client-odbc @@ -553,6 +525,7 @@ exit 0 %attr(2770,monetdb,monetdb) %dir %{_localstatedir}/monetdb5 %attr(2770,monetdb,monetdb) %dir %{_localstatedir}/monetdb5/dbfarm %{_bindir}/mserver5 +%exclude %{_bindir}/stethoscope %{_libdir}/libmonetdb5.so.* %dir %{_libdir}/monetdb5 %dir %{_libdir}/monetdb5/autoload diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -874,8 +874,4 @@ typedef __uint128_t uhge; #define HAVE_MAPI 1 #endif -#define PROMPT1 "\001\001\n" /* prompt: ready for new query */ -#define PROMPT2 "\001\002\n" /* prompt: more data needed */ -#define PROMPT3 "\001\003\n" /* prompt: get file content */ - #endif /* _SEEN_MONETDB_CONFIG_H */ diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -11324,6 +11324,7 @@ stdout of test 'MAL-signatures` in direc [ "profiler", "getlimit", "command profiler.getlimit():int ", "CMDgetprofilerlimit;", "Set profiler limit" ] [ "profiler", "noop", "command profiler.noop():void ", "CMDnoopProfiler;", "Fetch any pending performance events" ] [ "profiler", "openstream", "pattern profiler.openstream():void ", "CMDopenProfilerStream;", "Start profiling the events, send to output stream" ] +[ "profiler", "openstream", "pattern profiler.openstream(mode:int):void ", "CMDopenProfilerStream;", "Start profiling the events, send to output stream" ] [ "profiler", "setheartbeat", "command profiler.setheartbeat(b:int):void ", "CMDsetHeartbeat;", "Set heart beat performance tracing" ] [ "profiler", "setlimit", "command profiler.setlimit(l:int):void ", "CMDsetprofilerlimit;", "Get profiler limit" ] [ "profiler", "start", "pattern profiler.start():void ", "CMDstartProfiler;", "Start offline performance profiling" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -15746,6 +15746,7 @@ stdout of test 'MAL-signatures` in direc [ "profiler", "getlimit", "command profiler.getlimit():int ", "CMDgetprofilerlimit;", "Set profiler limit" ] [ "profiler", "noop", "command profiler.noop():void ", "CMDnoopProfiler;", "Fetch any pending performance events" ] [ "profiler", "openstream", "pattern profiler.openstream():void ", "CMDopenProfilerStream;", "Start profiling the events, send to output stream" ] +[ "profiler", "openstream", "pattern profiler.openstream(mode:int):void ", "CMDopenProfilerStream;", "Start profiling the events, send to output stream" ] [ "profiler", "setheartbeat", "command profiler.setheartbeat(b:int):void ", "CMDsetHeartbeat;", "Set heart beat performance tracing" ] [ "profiler", "setlimit", "command profiler.setlimit(l:int):void ", "CMDsetprofilerlimit;", "Get profiler limit" ] [ "profiler", "start", "pattern profiler.start():void ", "CMDstartProfiler;", "Start offline performance profiling" ] diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -303,17 +303,17 @@ str GDKstrdup(const char *s) __attribute str GDKstrndup(const char *s, size_t n) __attribute__((__warn_unused_result__)); void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...) __attribute__((__format__(__printf__, 1, 2))); gdk_return GDKtracer_flush_buffer(void); -char *GDKtracer_get_timestamp(char *fmt); +char *GDKtracer_get_timestamp(const char *fmt); gdk_return GDKtracer_init(void); -gdk_return GDKtracer_log(LOG_LEVEL level, char *fmt, ...) __attribute__((format(printf, 2, 3))); +gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); gdk_return GDKtracer_reset_adapter(void); -gdk_return GDKtracer_reset_component_level(int *comp); +gdk_return GDKtracer_reset_component_level(int comp); gdk_return GDKtracer_reset_flush_level(void); -gdk_return GDKtracer_reset_layer_level(int *layer); -gdk_return GDKtracer_set_adapter(int *adapter); -gdk_return GDKtracer_set_component_level(int *comp, int *lvl); -gdk_return GDKtracer_set_flush_level(int *lvl); -gdk_return GDKtracer_set_layer_level(int *layer, int *lvl); +gdk_return GDKtracer_reset_layer_level(int layer); +gdk_return GDKtracer_set_adapter(int adapter); +gdk_return GDKtracer_set_component_level(int comp, int lvl); +gdk_return GDKtracer_set_flush_level(int lvl); +gdk_return GDKtracer_set_layer_level(int layer, int lvl); gdk_return GDKtracer_show_info(void); gdk_return GDKtracer_stop(void); size_t GDKuniqueid(size_t offset); @@ -2387,7 +2387,6 @@ int isOptimizerEnabled(MalBlkPtr mb, str int isOptimizerPipe(const char *name); int isOrderby(InstrPtr q); int isSample(InstrPtr q); -int isSealedFunction(InstrPtr q); int isSelect(InstrPtr q); int isSideEffectFree(MalBlkPtr mb); int isSlice(InstrPtr q); @@ -2679,7 +2678,6 @@ void setVariableScope(MalBlkPtr mb); void setVariableType(MalBlkPtr mb, const int idx, malType type); str setWriteModeRef; void setprofilerlimit(int limit); -str shortStmtRendering(MalBlkPtr mb, MalStkPtr stl, InstrPtr p); void showAllScenarios(stream *f); void showCurrentScenario(void); void showMalBlkHistory(stream *out, MalBlkPtr mb); diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag --- a/clients/mapiclient/Makefile.ag +++ b/clients/mapiclient/Makefile.ag @@ -43,26 +43,6 @@ bin_stethoscope = { $(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS) $(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS) } -bin_tachograph = { - SOURCES = tachograph.c - LIBS = libmcutil \ - ../mapilib/libmapi \ - ../../common/stream/libstream \ - ../../common/utils/libmutils \ - WIN32?../../common/options/libmoptions \ - $(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS) $(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS) -} - -bin_tomograph = { - SOURCES = tomograph.c - LIBS = libmcutil \ - ../../common/utils/libmutils \ - ../mapilib/libmapi \ - ../../common/stream/libstream \ - WIN32?../../common/options/libmoptions \ - $(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS) $(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS) -} - man_MANS = mclient.1 msqldump.1 EXTRA_DIST = $(man_MANS) diff --git a/clients/mapiclient/Tests/All b/clients/mapiclient/Tests/All --- a/clients/mapiclient/Tests/All +++ b/clients/mapiclient/Tests/All @@ -1,5 +1,3 @@ mclient--help msqldump--help stethoscope--help -tomograph--help -tachograph--help diff --git a/clients/mapiclient/Tests/stethoscope--help.stable.err b/clients/mapiclient/Tests/stethoscope--help.stable.err --- a/clients/mapiclient/Tests/stethoscope--help.stable.err +++ b/clients/mapiclient/Tests/stethoscope--help.stable.err @@ -16,7 +16,6 @@ stethoscope [options] -P | --password=<password> -p | --port=<portnr> -h | --host=<hostname> - -c | --convert=<old formated file> -j | --json -o | --output=<file> -b | --beat=<delay> in milliseconds (default 50) diff --git a/clients/mapiclient/Tests/tachograph--help b/clients/mapiclient/Tests/tachograph--help deleted file mode 100755 --- a/clients/mapiclient/Tests/tachograph--help +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -Mlog -x tachograph --help diff --git a/clients/mapiclient/Tests/tachograph--help.bat b/clients/mapiclient/Tests/tachograph--help.bat deleted file mode 100755 --- a/clients/mapiclient/Tests/tachograph--help.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo on -@prompt # $t $g - - tachograph --help diff --git a/clients/mapiclient/Tests/tachograph--help.stable.err b/clients/mapiclient/Tests/tachograph--help.stable.err deleted file mode 100644 --- a/clients/mapiclient/Tests/tachograph--help.stable.err +++ /dev/null @@ -1,23 +0,0 @@ -stderr of test 'tachograph--help` in directory 'clients/mapiclient` itself: - - -# 11:43:47 > -# 11:43:47 > Mtimeout -timeout 120 ./tachograph--help tachograph--help -# 11:43:47 > - - -# 10:36:09 > -# 10:36:09 > Mtimeout -timeout 60 tachograph --help -# 10:36:09 > - -tachograph [options] - -d | --dbname=<database_name> - -u | --user=<user> - -p | --port=<portnr> - -h | --host=<hostname> - -? | --help - -# 23:54:13 > -# 23:54:13 > "Done." -# 23:54:13 > - diff --git a/clients/mapiclient/Tests/tachograph--help.stable.out b/clients/mapiclient/Tests/tachograph--help.stable.out deleted file mode 100644 --- a/clients/mapiclient/Tests/tachograph--help.stable.out +++ /dev/null @@ -1,17 +0,0 @@ -stdout of test 'tachograph--help` in directory 'clients/mapiclient` itself: - - -# 11:43:47 > -# 11:43:47 > Mtimeout -timeout 120 ./tachograph--help tachograph--help -# 11:43:47 > - - -# 11:43:47 > -# 11:43:47 > Mtimeout -timeout 60 tachograph --help -# 11:43:47 > - - -# 11:43:47 > -# 11:43:47 > Done. -# 11:43:47 > - diff --git a/clients/mapiclient/Tests/tomograph--help b/clients/mapiclient/Tests/tomograph--help deleted file mode 100755 --- a/clients/mapiclient/Tests/tomograph--help +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -Mlog -x tomograph --help diff --git a/clients/mapiclient/Tests/tomograph--help.bat b/clients/mapiclient/Tests/tomograph--help.bat deleted file mode 100755 --- a/clients/mapiclient/Tests/tomograph--help.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo on -@prompt # $t $g - - tomograph --help diff --git a/clients/mapiclient/Tests/tomograph--help.stable.err b/clients/mapiclient/Tests/tomograph--help.stable.err deleted file mode 100644 --- a/clients/mapiclient/Tests/tomograph--help.stable.err +++ /dev/null @@ -1,31 +0,0 @@ -stderr of test 'tomograph--help` in directory 'clients/mapiclient` itself: - - -# 11:43:47 > -# 11:43:47 > Mtimeout -timeout 120 ./tomograph--help tomograph--help -# 11:43:47 > - - -# 10:36:09 > -# 10:36:09 > Mtimeout -timeout 60 tomograph --help -# 10:36:09 > - -tomograph [options] - -d | --dbname=<database_name> _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list