Changeset: be1c38f2b3be for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be1c38f2b3be
Added Files:
sql/benchmarks/arno_flt/Tests/SingleServer
sql/benchmarks/nobench/Tests/SingleServer
sql/test/Users/Tests/metadataConsistency.sql
sql/test/Users/Tests/metadataConsistency.stable.err
sql/test/Users/Tests/metadataConsistency.stable.out
sql/test/VOC/VOCcreate_user.sql
sql/test/VOC/VOCdrop.sql
sql/test/VOC/VOCdrop_user.sql
sql/test/VOC/VOCinsert.sql
sql/test/VOC/VOCmanual_examples.sql
sql/test/VOC/VOCquery.sql
sql/test/merge-statements/Tests/mergestmt04.sql
sql/test/merge-statements/Tests/mergestmt04.stable.err
sql/test/merge-statements/Tests/mergestmt04.stable.out
sql/test/miscellaneous/Tests/groupings.sql
sql/test/miscellaneous/Tests/groupings.stable.err
sql/test/miscellaneous/Tests/groupings.stable.out
tools/merovingian/client/Tests/monetdb_status.stable.err
tools/merovingian/client/Tests/monetdb_status.stable.out
Removed Files:
sql/test/Tests/testlz4.lz4
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/odbc/driver/ODBCEnv.c
documentation/source/manual_pages/mclient.rst
documentation/source/manual_pages/monetdb.rst
documentation/source/manual_pages/monetdbd.rst.in
documentation/source/manual_pages/mserver5.rst.in
documentation/source/manual_pages/msqldump.rst
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc_compare.h
gdk/gdk_cand.c
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_group.c
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_project.c
gdk/gdk_sample.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_string.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_tm.c
gdk/gdk_tracer.c
gdk/gdk_tracer.h
gdk/gdk_unique.c
gdk/gdk_utils.c
gdk/gdk_utils.h
geom/monetdb5/geom.c
monetdb5/extras/rapi/converters.c.h
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resolve.c
monetdb5/modules/atoms/identifier.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/oltp.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tracer.c
monetdb5/modules/mal/tracer.h
monetdb5/modules/mal/tracer.mal
monetdb5/optimizer/opt_json.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_pushselect.c
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi3/connection3.c
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/backends/monet5/UDF/udf/udf.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_transaction.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/wlr.c
sql/benchmarks/nobench/Tests/nobench.sql
sql/benchmarks/nobench/Tests/nobench.stable.out
sql/benchmarks/tpcds/Tests/44.stable.out
sql/benchmarks/tpcds/Tests/54.stable.out
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/scripts/81_tracer.sql
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_sequence.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_mvc.c
sql/server/sql_partition.c
sql/server/sql_privileges.c
sql/server/sql_semantic.c
sql/server/sql_symbol.c
sql/server/sql_tokens.h
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_table.c
sql/storage/store.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.stable.out
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out
sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out
sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6477.stable.out
sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single
sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.sql
sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.stable.out
sql/test/BugTracker/Tests/ambiguous_join.SF-1580565.stable.err
sql/test/Tests/ifexists-views.sql
sql/test/Users/Tests/All
sql/test/VOC/Tests/VOC.SQL.py
sql/test/VOC/Tests/VOC.stable.out
sql/test/VOC/Tests/double_is_null.Bug-3116.sql
sql/test/VOC/Tests/double_is_null.Bug-3116.stable.out
sql/test/VOC/Tests/median.Bug-3096.sql
sql/test/VOC/Tests/median.Bug-3096.stable.out
sql/test/VOC/VOCschema.sql
sql/test/analytics/Tests/analytics13.stable.out
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/emptydb/Tests/check.stable.out.int128
sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out
sql/test/merge-partitions/Tests/mergepart28.stable.err
sql/test/merge-statements/Tests/All
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/mergetables/Tests/sqlsmith-exists.stable.out
sql/test/miscellaneous/Tests/All
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/miscellaneous/Tests/simple_selects.stable.out
sql/test/subquery/Tests/correlated.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/sys-schema/Tests/systemfunctions.stable.out.int128
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/All
testing/Mtest.py.in
testing/listexports.py.in
tools/merovingian/client/Tests/monetdb_status.py
tools/mserver/mserver5.1.in
Branch: json
Log Message:
Merge with default branch.
diffs (truncated from 73851 to 300 lines):
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
@@ -10918,13 +10918,13 @@ stdout of test 'MAL-signatures` in direc
[ "logging", "compinfo", "pattern logging.compinfo() (id:bat[:int],
component:bat[:str], log_level:bat[:str]) ", "TRACERcomp_info;", "Returns
in the form of a SQL result-set all the components along with their ID\nand the
their current logging level being set" ]
[ "logging", "flush", "command logging.flush():void ",
"TRACERflush_buffer;", "Flush the buffer" ]
[ "logging", "resetadapter", "command logging.resetadapter():void ",
"TRACERreset_adapter;", "Resets the adapter back to the default" ]
-[ "logging", "resetcomplevel", "command
logging.resetcomplevel(comp:int):void ", "TRACERreset_component_level;",
"Resets the log level for a specific component back to the default" ]
+[ "logging", "resetcomplevel", "command
logging.resetcomplevel(comp:str):void ", "TRACERreset_component_level;",
"Resets the log level for a specific component back to the default" ]
[ "logging", "resetflushlevel", "command logging.resetflushlevel():void
", "TRACERreset_flush_level;", "Resets the flush level back to the
default" ]
-[ "logging", "resetlayerlevel", "command
logging.resetlayerlevel(layer:int):void ", "TRACERreset_layer_level;",
"Resets the log level for a specific layer back to the default" ]
-[ "logging", "setadapter", "command logging.setadapter(adapter:int):void
", "TRACERset_adapter;", "Sets the adapter" ]
-[ "logging", "setcomplevel", "command logging.setcomplevel(comp:int,
lvl:int):void ", "TRACERset_component_level;", "Sets the log level for
a specific component" ]
-[ "logging", "setflushlevel", "command
logging.setflushlevel(lvl:int):void ", "TRACERset_flush_level;", "Sets
the flush level" ]
-[ "logging", "setlayerlevel", "command
logging.setlayerlevel(layer:int, lvl:int):void ",
"TRACERset_layer_level;", "Sets the log level for a specific layer"
]
+[ "logging", "resetlayerlevel", "command
logging.resetlayerlevel(layer:str):void ", "TRACERreset_layer_level;",
"Resets the log level for a specific layer back to the default" ]
+[ "logging", "setadapter", "command logging.setadapter(adapter:str):void
", "TRACERset_adapter;", "Sets the adapter" ]
+[ "logging", "setcomplevel", "command logging.setcomplevel(comp:str,
lvl:str):void ", "TRACERset_component_level;", "Sets the log level for
a specific component" ]
+[ "logging", "setflushlevel", "command
logging.setflushlevel(lvl:str):void ", "TRACERset_flush_level;", "Sets
the flush level" ]
+[ "logging", "setlayerlevel", "command
logging.setlayerlevel(layer:str, lvl:str):void ",
"TRACERset_layer_level;", "Sets the log level for a specific layer"
]
[ "mal", "manifold", "pattern mal.manifold(mod:str, fcn:str,
a:any...):bat[:any] ", "MANIFOLDevaluate;", "" ]
[ "mal", "multiplex", "pattern mal.multiplex(mod:str, fcn:str,
a:any...):any... ", "MANIFOLDremapMultiplex;", "" ]
[ "manual", "functions", "pattern manual.functions() (mod:bat[:str],
fcn:bat[:str], sig:bat[:str], adr:bat[:str], com:bat[:str]) ",
"MANUALcreateOverview;", "Produces a table with all MAL functions known"
]
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
@@ -15338,13 +15338,13 @@ stdout of test 'MAL-signatures` in direc
[ "logging", "compinfo", "pattern logging.compinfo() (id:bat[:int],
component:bat[:str], log_level:bat[:str]) ", "TRACERcomp_info;", "Returns
in the form of a SQL result-set all the components along with their ID\nand the
their current logging level being set" ]
[ "logging", "flush", "command logging.flush():void ",
"TRACERflush_buffer;", "Flush the buffer" ]
[ "logging", "resetadapter", "command logging.resetadapter():void ",
"TRACERreset_adapter;", "Resets the adapter back to the default" ]
-[ "logging", "resetcomplevel", "command
logging.resetcomplevel(comp:int):void ", "TRACERreset_component_level;",
"Resets the log level for a specific component back to the default" ]
+[ "logging", "resetcomplevel", "command
logging.resetcomplevel(comp:str):void ", "TRACERreset_component_level;",
"Resets the log level for a specific component back to the default" ]
[ "logging", "resetflushlevel", "command logging.resetflushlevel():void
", "TRACERreset_flush_level;", "Resets the flush level back to the
default" ]
-[ "logging", "resetlayerlevel", "command
logging.resetlayerlevel(layer:int):void ", "TRACERreset_layer_level;",
"Resets the log level for a specific layer back to the default" ]
-[ "logging", "setadapter", "command logging.setadapter(adapter:int):void
", "TRACERset_adapter;", "Sets the adapter" ]
-[ "logging", "setcomplevel", "command logging.setcomplevel(comp:int,
lvl:int):void ", "TRACERset_component_level;", "Sets the log level for
a specific component" ]
-[ "logging", "setflushlevel", "command
logging.setflushlevel(lvl:int):void ", "TRACERset_flush_level;", "Sets
the flush level" ]
-[ "logging", "setlayerlevel", "command
logging.setlayerlevel(layer:int, lvl:int):void ",
"TRACERset_layer_level;", "Sets the log level for a specific layer"
]
+[ "logging", "resetlayerlevel", "command
logging.resetlayerlevel(layer:str):void ", "TRACERreset_layer_level;",
"Resets the log level for a specific layer back to the default" ]
+[ "logging", "setadapter", "command logging.setadapter(adapter:str):void
", "TRACERset_adapter;", "Sets the adapter" ]
+[ "logging", "setcomplevel", "command logging.setcomplevel(comp:str,
lvl:str):void ", "TRACERset_component_level;", "Sets the log level for
a specific component" ]
+[ "logging", "setflushlevel", "command
logging.setflushlevel(lvl:str):void ", "TRACERset_flush_level;", "Sets
the flush level" ]
+[ "logging", "setlayerlevel", "command
logging.setlayerlevel(layer:str, lvl:str):void ",
"TRACERset_layer_level;", "Sets the log level for a specific layer"
]
[ "mal", "manifold", "pattern mal.manifold(mod:str, fcn:str,
a:any...):bat[:any] ", "MANIFOLDevaluate;", "" ]
[ "mal", "multiplex", "pattern mal.multiplex(mod:str, fcn:str,
a:any...):any... ", "MANIFOLDremapMultiplex;", "" ]
[ "manual", "functions", "pattern manual.functions() (mod:bat[:str],
fcn:bat[:str], sig:bat[:str], adr:bat[:str], com:bat[:str]) ",
"MANUALcreateOverview;", "Produces a table with all MAL functions known"
]
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
@@ -217,6 +217,7 @@ BUN BUNfnd(BAT *b, const void *right);
gdk_return BUNinplace(BAT *b, BUN p, const void *right, bool force)
__attribute__((__warn_unused_result__));
BAT *COLcopy(BAT *b, int tt, bool writable, role_t role);
BAT *COLnew(oid hseq, int tltype, BUN capacity, role_t role)
__attribute__((__warn_unused_result__));
+const char *COMPONENT_STR[];
size_t GDK_mem_maxsize;
size_t GDK_vm_maxsize;
gdk_return GDKanalytical_correlation(BAT *r, BAT *b1, BAT *b2, BAT *s, BAT *e,
int tpe);
@@ -303,16 +304,16 @@ void GDKsyserror(_In_z_ _Printf_format_s
gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT *log_level);
gdk_return GDKtracer_flush_buffer(void);
char *GDKtracer_get_timestamp(const char *fmt, char *buf, size_t sz);
-gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...)
__attribute__((format(printf, 2, 3)));
+gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...)
__attribute__((__format__(__printf__, 2, 3)));
void GDKtracer_reinit_basic(int sig);
gdk_return GDKtracer_reset_adapter(void);
-gdk_return GDKtracer_reset_component_level(int comp);
+gdk_return GDKtracer_reset_component_level(const char *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(const char *layer);
+gdk_return GDKtracer_set_adapter(const char *adapter);
+gdk_return GDKtracer_set_component_level(const char *comp, const char *lvl);
+gdk_return GDKtracer_set_flush_level(const char *lvl);
+gdk_return GDKtracer_set_layer_level(const char *layer, const char *lvl);
gdk_return GDKtracer_stop(void);
size_t GDKuniqueid(size_t offset);
gdk_return GDKupgradevarheap(BAT *b, var_t v, bool copyall, bool mayshare)
__attribute__((__warn_unused_result__));
@@ -333,6 +334,7 @@ size_t HEAPmemsize(Heap *h);
size_t HEAPvmsize(Heap *h);
void IMPSdestroy(BAT *b);
lng IMPSimprintsize(BAT *b);
+const char *LEVEL_STR[];
LOG_LEVEL LVL_PER_COMPONENT[];
int MT_check_nr_cores(void);
int MT_create_thread(MT_Id *t, void (*function)(void *), void *arg, enum
MT_thr_detach d, const char *threadname);
@@ -824,7 +826,6 @@ str AUTHgetUsername(str *ret, Client c);
str AUTHgetUsers(BAT **ret1, BAT **ret2, Client c);
str AUTHinitTables(const char *passwd);
str AUTHremoveUser(Client c, const char *username);
-void AUTHreset(void) __attribute__((__visibility__("hidden")));
str AUTHresolveUser(str *ret, oid uid);
str AUTHsetPassword(Client c, const char *username, const char *passwd);
str AUTHunlockVault(const char *password);
@@ -1495,11 +1496,8 @@ str MCawakeClient(int id);
void MCcloseClient(Client c);
Client MCforkClient(Client father);
Client MCgetClient(int id);
-bool MCinit(void);
Client MCinitClient(oid user, bstream *fin, stream *fout);
-int MCinitClientThread(Client c);
int MCpushClientInput(Client c, bstream *new_input, int listing, char *prompt);
-int MCshutdowninprogress(void);
void MCstopClients(Client c);
str MCsuspendClient(int id);
int MCvalid(Client c);
@@ -1713,8 +1711,6 @@ str PCREreplace_wrap(str *res, const str
str PCREreplacefirst_bat_wrap(bat *res, const bat *or, const str *pat, const
str *repl, const str *flags);
str PCREreplacefirst_wrap(str *res, const str *or, const str *pat, const str
*repl, const str *flags);
str PCREsql2pcre(str *ret, const str *pat, const str *esc);
-str PROFexitClient(Client c);
-str PROFinitClient(Client c);
str QLOGappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str QLOGcalls(BAT **r);
@@ -1918,13 +1914,13 @@ str TKNZRtakeOid(Client cntxt, MalBlkPtr
str TRACERcomp_info(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str TRACERflush_buffer(void *ret);
str TRACERreset_adapter(void *ret);
-str TRACERreset_component_level(void *ret, int *comp_id);
+str TRACERreset_component_level(void *ret, str *comp_id);
str TRACERreset_flush_level(void *ret);
-str TRACERreset_layer_level(void *ret, int *layer_id);
-str TRACERset_adapter(void *ret, int *adapter_id);
-str TRACERset_component_level(void *ret, int *comp_id, int *lvl_id);
-str TRACERset_flush_level(void *ret, int *lvl_id);
-str TRACERset_layer_level(void *ret, int *layer_id, int *lvl_id);
+str TRACERreset_layer_level(void *ret, str *layer_id);
+str TRACERset_adapter(void *ret, str *adapter_id);
+str TRACERset_component_level(void *ret, str *comp_id, str *lvl_id);
+str TRACERset_flush_level(void *ret, str *lvl_id);
+str TRACERset_layer_level(void *ret, str *layer_id, str *lvl_id);
int TRACEtable(Client cntxt, BAT **r);
str TRNglobal_abort(bit *ret);
str TRNglobal_commit(bit *ret);
@@ -2382,25 +2378,17 @@ char *malLibraryHowToEnable(str name);
int malProfileMode;
str malRef;
void mal_atom_reset(void);
-void mal_client_reset(void) __attribute__((__visibility__("hidden")));
ClientRec *mal_clients;
MT_Lock mal_contextLock;
MT_Lock mal_copyLock;
-void mal_dataflow_reset(void) __attribute__((__visibility__("hidden")));
MT_Lock mal_delayLock;
_Noreturn void mal_exit(int status);
-void mal_factory_reset(void) __attribute__((__visibility__("hidden")));
int mal_init(void);
void mal_instruction_reset(void);
-void mal_linker_reset(void) __attribute__((__visibility__("hidden")));
-void mal_module_reset(void) __attribute__((__visibility__("hidden")));
-void mal_namespace_reset(void) __attribute__((__visibility__("hidden")));
MT_Lock mal_oltpLock;
MT_Lock mal_profileLock;
str mal_quote(const char *msg, size_t size);
MT_Lock mal_remoteLock;
-void mal_resource_reset(void) __attribute__((__visibility__("hidden")));
-void mal_runtime_reset(void) __attribute__((__visibility__("hidden")));
void mal_unquote(char *msg);
stream *maleventstream;
str manifoldRef;
diff --git a/clients/odbc/driver/ODBCEnv.c b/clients/odbc/driver/ODBCEnv.c
--- a/clients/odbc/driver/ODBCEnv.c
+++ b/clients/odbc/driver/ODBCEnv.c
@@ -113,7 +113,7 @@ ODBCError *
getEnvError(ODBCEnv *env)
{
assert(isValidEnv(env));
- return env->Error;;
+ return env->Error;
}
diff --git a/documentation/source/manual_pages/mclient.rst
b/documentation/source/manual_pages/mclient.rst
--- a/documentation/source/manual_pages/mclient.rst
+++ b/documentation/source/manual_pages/mclient.rst
@@ -1,3 +1,7 @@
+=======
+MCLIENT
+=======
+
NAME
====
@@ -32,17 +36,16 @@ the **--interactive** (**-i**) option is
lines starting with **\\** (backslash) specially. See the section
BACKSLASH COMMANDS below.
-Before *mclient* starts parsing command line options, it reads a
-*.monetdb* file. If the environment variable **DOTMONETDBFILE** is set,
-it reads the file pointed to by that variable instead. When unset,
-*mclient* searches for a *.monetdb* file in the current working
-directory, and if that doesn't exist, in the current user's home
-directory. This file can contain defaults for the flags **user**,
-**password**, **language**, **database**, **save_history**, **format**,
-and **width**. For example, an entry in a *.monetdb* file that sets the
-default language for *mclient* to mal looks like this: **language=mal**.
-To disable reading the *.monetdb* file, set the variable
-**DOTMONETDBFILE** to the empty string in the environment.
+Before *mclient* starts parsing command line options, it reads a *.monetdb*
+file. If the environment variable **DOTMONETDBFILE** is set, it reads the file
+pointed to by that variable instead. When unset, *mclient* searches for a
+*.monetdb* file in the current working directory, and if that doesn't exist, in
+the current user's home directory. This file can contain defaults for the flags
+**user**, **password**, **language**, **database**, **save_history**,
+**format**, **host**, **port**, and **width**. For example, an entry in a
+*.monetdb* file that sets the default language for *mclient* to mal looks like
+this: **language=mal**. To disable reading the *.monetdb* file, set the
+variable **DOTMONETDBFILE** to the empty string in the environment.
OPTIONS
=======
diff --git a/documentation/source/manual_pages/monetdb.rst
b/documentation/source/manual_pages/monetdb.rst
--- a/documentation/source/manual_pages/monetdb.rst
+++ b/documentation/source/manual_pages/monetdb.rst
@@ -1,3 +1,7 @@
+=======
+MONETDB
+=======
+
NAME
====
diff --git a/documentation/source/manual_pages/monetdbd.rst.in
b/documentation/source/manual_pages/monetdbd.rst.in
--- a/documentation/source/manual_pages/monetdbd.rst.in
+++ b/documentation/source/manual_pages/monetdbd.rst.in
@@ -1,3 +1,8 @@
+========
+MONETDBD
+========
+
+
NAME
====
diff --git a/documentation/source/manual_pages/mserver5.rst.in
b/documentation/source/manual_pages/mserver5.rst.in
--- a/documentation/source/manual_pages/mserver5.rst.in
+++ b/documentation/source/manual_pages/mserver5.rst.in
@@ -1,3 +1,8 @@
+========
+MSERVER5
+========
+
+
NAME
====
diff --git a/documentation/source/manual_pages/msqldump.rst
b/documentation/source/manual_pages/msqldump.rst
--- a/documentation/source/manual_pages/msqldump.rst
+++ b/documentation/source/manual_pages/msqldump.rst
@@ -1,3 +1,7 @@
+========
+MSQLDUMP
+========
+
NAME
====
@@ -19,14 +23,14 @@ accelerators, and an SQL front end.
*Msqldump* is the program to dump an MonetDB/SQL database. The dump can
be used to populate a new MonetDB/SQL database.
-Before *msqldump* starts parsing command line options, it reads a
-*.monetdb* file. If the environment variable **DOTMONETDBFILE** is set,
-it reads the file pointed to by that variable instead. When unset,
-*msqldump* searches for a *.monetdb* file in the current working
-directory, and if that doesn't exist, in the current user's home
-directory. This file can contain defaults for the flags **user** and
-**password**. To disable reading the *.monetdb* file, set the variable
-**DOTMONETDBFILE** to the empty string in the environment.
+Before *msqldump* starts parsing command line options, it reads a *.monetdb*
+file. If the environment variable **DOTMONETDBFILE** is set, it reads the file
+pointed to by that variable instead. When unset, *msqldump* searches for a
+*.monetdb* file in the current working directory, and if that doesn't exist, in
+the current user's home directory. This file can contain defaults for the flags
+**user**, **password**, **host**, and **port**. To disable reading the
+*.monetdb* file, set the variable **DOTMONETDBFILE** to the empty string in the
+environment.
OPTIONS
=======
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -361,62 +361,21 @@
*/
#define THRDMASK (1)
-#define THRDDEBUG if (GDKdebug & THRDMASK)
#define CHECKMASK (1<<1)
#define CHECKDEBUG if (GDKdebug & CHECKMASK)
-#define MEMMASK (1<<2)
-#define MEMDEBUG if (GDKdebug & MEMMASK)
#define PROPMASK (1<<3)
#define PROPDEBUG if (GDKdebug & PROPMASK)
#define IOMASK (1<<4)
-#define IODEBUG if (GDKdebug & IOMASK)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
