Changeset: 4acad02b99a6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4acad02b99a6
Added Files:
sql/test/BugTracker-2018/Tests/ordered-index-error.Bug-6572.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6568.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6568.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6568.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6573.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in-cast.Bug-6561.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in-cast.Bug-6561.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in-cast.Bug-6561.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-not-null-not-in.Bug-6562.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-not-null-not-in.Bug-6562.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-not-null-not-in.Bug-6562.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-mal-calc-undefined.Bug-6566.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-undefined-calc.Bug-6570.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-undefined-calc.Bug-6570.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-undefined-calc.Bug-6570.stable.out
sql/test/BugTracker-2018/Tests/truncate_tmp_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_tmp_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_tmp_tables.Bug-6543.stable.err
sql/test/BugTracker-2018/Tests/truncate_tmp_tables.Bug-6543.stable.out
Removed Files:
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog.Mar2018
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
clients/Tests/exports.stable.out
clients/examples/C/Makefile.ag
clients/mapiclient/Makefile.ag
clients/mapiclient/mclient.c
clients/mapilib/Makefile.ag
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/Makefile.ag
common/stream/monetdb-stream.pc.in
common/utils/mcrypt.h
configure.ag
debian/changelog
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_cand.h
gdk/gdk_cross.c
gdk/gdk_group.c
gdk/gdk_join.c
gdk/gdk_select.c
gdk/libbat.rc
gdk/monetdb-gdk.pc.in
geom/monetdb5/Makefile.ag
libversions
monetdb5/extras/mal_optimizer_template/Makefile.ag
monetdb5/extras/rapi/Makefile.ag
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/tools/Makefile.ag
monetdb5/tools/libmonetdb5.rc
monetdb5/tools/monetdb5.pc.in
sql/ChangeLog-Archive
sql/ChangeLog.Mar2018
sql/backends/monet5/LSST/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/UDF/capi/Makefile.ag
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi3/Makefile.ag
sql/backends/monet5/UDF/udf/Makefile.ag
sql/backends/monet5/generator/Makefile.ag
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/vaults/Makefile.ag
sql/backends/monet5/vaults/bam/Makefile.ag
sql/backends/monet5/vaults/bam/Tests/mergetable.stable.out
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/Makefile.ag
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/shp/Makefile.ag
sql/include/sql_mem.h
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_privileges.c
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2015/Tests/null.Bug-3833.stable.out
sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out
sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
sql/test/BugTracker-2017/Tests/caching_stats_bug.6374.stable.out
sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out
sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD
sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.err
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-coalesce.Bug-6550.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-case-coalesce.Bug-6550.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-aggregation-count.Bug-6510.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-wrong-cast-null.Bug-6551.stable.out
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-1join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-0join-view.stable.out
sql/test/Skyserver/Tests/Skyserver.stable.out
sql/test/VOC/Tests/VOC.stable.out
sql/test/bugs/Tests/create_insert_select_aggr-bug-00001.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
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.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/mergetables/Tests/part-elim.stable.out
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/random.stable.out
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.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/dump.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
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
testing/Mtest.py.in
testing/listexports.py.in
tools/merovingian/client/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/properties.c
tools/mserver/Makefile.ag
vertoo.data
Branch: config_rss
Log Message:
Merge with Mar2018.
diffs (truncated from 129732 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -692,3 +692,6 @@ 4fd4a5c7b66747468a2b41930d1b987a4b0efff4
a294cafd5cac3397e148032bee9d8efc89f5c82a Mar2018_root
28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_1
28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_release
+f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_3
+28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_release
+f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.29.2
+%define version 11.29.4
%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
@@ -1046,6 +1046,21 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Tue Mar 27 2018 Sjoerd Mullender <sjo...@acm.org> - 11.29.3-20180327
+- Rebuilt.
+- BZ#3824: Created table not visible from ODBC
+- BZ#6556: Sqlitelogictest division by zero on COALESCE call
+- BZ#6557: Sqlitelogictest crash on aggregation query with not in
+- BZ#6559: rows in sys.statistics are not removed when a temporary table
+ is dropped.
+- BZ#6560: Sqlitelogictest crash on group by query with having in
+- BZ#6561: Sqlitelogictest crash on group by query with having not
+ in clause
+
+* Thu Mar 15 2018 Sjoerd Mullender <sjo...@acm.org> - 11.29.3-20180327
+- sql: Extended support to use CREATE ORDERED INDEX on columns of type: char,
+ varchar, clob, blob, url, json, inet and uuid.
+
* Thu Mar 15 2018 Sjoerd Mullender <sjo...@acm.org> - 11.29.1-20180315
- Rebuilt.
- BZ#3574: Add support for: create OR REPLACE view ...
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
@@ -666,7 +666,7 @@
#define PACKAGE_URL "https://www.monetdb.org/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.29.2"
+#define PACKAGE_VERSION "11.29.4"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-VERSION=11.29.2
+VERSION=11.29.4
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/buildtools/ChangeLog.Mar2018 b/buildtools/ChangeLog.Mar2018
--- a/buildtools/ChangeLog.Mar2018
+++ b/buildtools/ChangeLog.Mar2018
@@ -1,3 +1,11 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Apr 3 2018 Sjoerd Mullender <sjo...@acm.org>
+- On Linux and Unix, try not to link to libraries multiple times: that
+ only causes the code (and worse, the variables in those libraries) to be
+ included multiple times. On Windows, we do need to link to libraries
+ multiple times (once for each DLL we create if the DLL references
+ anything from the library) but that doesn't cause the linked library
+ to be loaded multiple times.
+
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -208,12 +208,19 @@ def am_additional_libs(name, sep, type,
if l[0] not in ("-", "$", "@"):
l = am_translate_dir(l, am) + ".la"
if c:
- if c in ('NATIVE_WIN32', 'WIN32'):
+ c = c.split('&')
+ if 'NATIVE_WIN32' in c:
continue
global libno
v = 'LIB%d' % libno
libno = libno + 1
- add = 'if %s\n%s = %s\nelse\n%s =\nendif\n%s' % (c, v, l, v, add)
+ s = ''
+ for x in c:
+ s += 'if %s\n' % x
+ s += '%s = %s\n' % (v, l)
+ for x in c:
+ s += 'else\n%s =\nendif\n' % v
+ add = s + add
l = '$(%s)' % v
add = add + " " + l
return add + "\n"
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -209,8 +209,15 @@ def msc_additional_libs(fd, name, sep, t
for l in list:
if '?' in l:
c, l = l.split('?', 1)
- if c in ('NATIVE_WIN32', 'WIN32'):
- c = None
+ c = c.split('&')
+ try:
+ c.remove('NATIVE_WIN32')
+ except ValueError:
+ pass
+ try:
+ c.remove('WIN32')
+ except ValueError:
+ pass
else:
c = None
d = None
@@ -243,7 +250,7 @@ def msc_additional_libs(fd, name, sep, t
global libno
v = 'LIB%d' % libno
libno = libno + 1
- cond += '!IF defined(%s)\n%s = %s\n!ELSE\n%s =\n!ENDIF\n' % (c, v,
l, v)
+ cond += '!IF defined(%s)\n%s = %s\n!ELSE\n%s =\n!ENDIF\n' % (') &&
defined('.join(c), v, l, v)
l = '$(%s)' % v
if d:
deps = '%s %s' % (deps, l)
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
@@ -432,23 +432,6 @@ char *mo_find_option(opt *set, int setle
void mo_free_options(opt *set, int setlen);
void mo_print_options(opt *set, int setlen);
int mo_system_config(opt **Set, int setlen);
-void msab_dbfarminit(const char *dbfarm);
-void msab_dbpathinit(const char *dbpath);
-char *msab_deserialise(sabdb **ret, char *sabdb);
-char *msab_freeStatus(sabdb **ret);
-char *msab_getDBfarm(char **ret);
-char *msab_getDBname(char **ret);
-char *msab_getMyStatus(sabdb **ret);
-char *msab_getStatus(sabdb **ret, char *dbname);
-char *msab_getUplogInfo(sabuplog *ret, const sabdb *db);
-char *msab_marchConnection(const char *host, const int port);
-char *msab_marchScenario(const char *lang);
-char *msab_registerStarted(void);
-char *msab_registerStarting(void);
-char *msab_registerStop(void);
-char *msab_retreatScenario(const char *lang);
-char *msab_serialise(char **ret, const sabdb *db);
-char *msab_wildRetreat(void);
const oid oid_nil;
DIR *opendir(const char *dirname);
void print_trace(void);
@@ -581,6 +564,22 @@ MapiMsg mapi_timeout(Mapi mid, unsigned
void mapi_trace(Mapi mid, int flag);
char *mapi_unquote(char *msg);
MapiMsg mapi_virtual_result(MapiHdl hdl, int columns, const char
**columnnames, const char **columntypes, const int *columnlengths, int
tuplecount, const char ***tuples);
+char *mcrypt_BackendSum(const char *string, size_t len);
+char *mcrypt_MD5Sum(const char *string, size_t len);
+char *mcrypt_RIPEMD160Sum(const char *string, size_t len);
+char *mcrypt_SHA1Sum(const char *string, size_t len);
+char *mcrypt_SHA224Sum(const char *string, size_t len);
+char *mcrypt_SHA256Sum(const char *string, size_t len);
+char *mcrypt_SHA384Sum(const char *string, size_t len);
+char *mcrypt_SHA512Sum(const char *string, size_t len);
+const char *mcrypt_getHashAlgorithms(void);
+char *mcrypt_hashPassword(const char *algo, const char *password, const char
*challenge);
+int mo_add_option(opt **Set, int setlen, opt_kind kind, const char *name,
const char *value);
+int mo_builtin_settings(opt **Set);
+char *mo_find_option(opt *set, int setlen, const char *name);
+void mo_free_options(opt *set, int setlen);
+void mo_print_options(opt *set, int setlen);
+int mo_system_config(opt **Set, int setlen);
const char *wsaerror(int);
# monetdb5
@@ -2344,6 +2343,23 @@ char monet_characteristics[4096];
char monet_cwd[FILENAME_MAX];
size_t monet_memory;
void moveInstruction(MalBlkPtr mb, int pc, int target);
+void msab_dbfarminit(const char *dbfarm);
+void msab_dbpathinit(const char *dbpath);
+char *msab_deserialise(sabdb **ret, char *sabdb);
+char *msab_freeStatus(sabdb **ret);
+char *msab_getDBfarm(char **ret);
+char *msab_getDBname(char **ret);
+char *msab_getMyStatus(sabdb **ret);
+char *msab_getStatus(sabdb **ret, char *dbname);
+char *msab_getUplogInfo(sabuplog *ret, const sabdb *db);
+char *msab_marchConnection(const char *host, const int port);
+char *msab_marchScenario(const char *lang);
+char *msab_registerStarted(void);
+char *msab_registerStarting(void);
+char *msab_registerStop(void);
+char *msab_retreatScenario(const char *lang);
+char *msab_serialise(char **ret, const sabdb *db);
+char *msab_wildRetreat(void);
void mserver_reset(int exit);
str mtimeRef;
str mulRef;
diff --git a/clients/examples/C/Makefile.ag b/clients/examples/C/Makefile.ag
--- a/clients/examples/C/Makefile.ag
+++ b/clients/examples/C/Makefile.ag
@@ -5,15 +5,14 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
MTSAFE
-INCLUDES = ../../mapilib ../../../common/options $(READLINE_INCS)
-
-MAPI_LIBS = $(SOCKET_LIBS)
+INCLUDES = ../../mapilib
BINS = {
CONDINST = HAVE_TESTING
DIR = bindir
SOURCES = sample0.c sample1.c sample4.c \
smack00.c smack01.c
- LIBS = $(MAPI_LIBS) ../../mapilib/libmapi \
- $(curl_LIBS)
+ LIBS = ../../mapilib/libmapi \
+ ../../../common/stream/libstream \
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -14,43 +14,44 @@ lib_mcutil = {
bin_mclient = {
SOURCES = mclient.c ReadlineTools.c ReadlineTools.h mhelp.c mhelp.h
- LIBS = libmcutil ../mapilib/libmapi \
- ../../common/stream/libstream \
+ LIBS = libmcutil \
../../common/utils/libmutils \
+ ../mapilib/libmapi \
+ ../../common/stream/libstream \
$(READLINE_LIBS) \
- $(curl_LIBS) $(LTLIBICONV) $(PTHREAD_LIBS) $(MATH_LIBS)
$(SOCKET_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
bin_msqldump = {
SOURCES = msqldump.c msqldump.h
- LIBS = libmcutil ../mapilib/libmapi \
+ LIBS = libmcutil ../../common/utils/libmutils \
+ ../mapilib/libmapi \
../../common/stream/libstream \
- ../../common/utils/libmutils \
- $(curl_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
bin_stethoscope = {
SOURCES = stethoscope.c
- LIBS = libmcutil ../mapilib/libmapi \
+ LIBS = libmcutil ../../common/utils/libmutils \
+ ../mapilib/libmapi \
../../common/stream/libstream \
- ../../common/utils/libmutils \
- $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
bin_tachograph = {
SOURCES = tachograph.c
- LIBS = libmcutil ../mapilib/libmapi \
+ LIBS = libmcutil ../../common/utils/libmutils \
+ ../mapilib/libmapi \
../../common/stream/libstream \
- ../../common/utils/libmutils \
- $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
bin_tomograph = {
SOURCES = tomograph.c
- LIBS = libmcutil ../mapilib/libmapi \
+ LIBS = libmcutil ../../common/utils/libmutils \
+ ../mapilib/libmapi \
../../common/stream/libstream \
- ../../common/utils/libmutils \
- $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
# disabled: it's not really a tool for users, more to debug mapi
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -269,7 +269,7 @@ timerHuman(int64_t sqloptimizer, int64_t
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
