Changeset: 6d76f5b087e9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d76f5b087e9
Added Files:
clients/python2/test/test_pythonize.py
clients/python3/test/test_pythonize.py
debian/monetdb-client-tools.install
gdk/gdk_join.c
sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.sql
sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.stable.err
sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.stable.out
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/rules.msc
buildtools/autogen/autogen/msc.py
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapiclient/tomograph.c
clients/python2/monetdb/control.py
clients/python2/monetdb/mapi.py
clients/python2/monetdb/sql/connections.py
clients/python2/monetdb/sql/cursors.py
clients/python2/monetdb/sql/pythonize.py
clients/python2/test/run.sh
clients/python2/test/runtests.py
clients/python3/monetdb/mapi.py
clients/python3/monetdb/sql/connections.py
clients/python3/monetdb/sql/cursors.py
clients/python3/monetdb/sql/pythonize.py
clients/python3/test/dbapi20.py
clients/python3/test/runtests.py
debian/control
debian/monetdb-client.install
debian/monetdb5-sql.install
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_atomic.h
gdk/gdk_bat.c
gdk/gdk_calc.c
gdk/gdk_calc_compare.h
gdk/gdk_calc_private.h
gdk/gdk_group.c
gdk/gdk_imprints.c
gdk/gdk_private.h
gdk/gdk_relop.mx
gdk/gdk_search.c
gdk/gdk_search.h
gdk/gdk_select.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
monetdb5/extras/jaql/json.c
monetdb5/mal/mal_box.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resource.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/group.mx
monetdb5/modules/mal/const.c
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
sql/backends/monet5/Tests/optimizers.stable.out
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.mx
sql/common/sql_hash.c
sql/include/sql_catalog.h
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/server/sql_qc.c
sql/storage/bat/bat_storage.c
sql/storage/sql_catalog.c
sql/storage/store.c
sql/test/ADT2006/Tests/bram.stable.out
sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/variable_arg_substring.SF_942981.stable.out
sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out
sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
sql/test/BugDay_2005-11-09_2.9.3/Tests/union-duplicates.SF-1119186.stable.out
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out
sql/test/BugTracker-2009/Tests/group_by_on_values.SF-2837561.stable.out
sql/test/BugTracker-2009/Tests/not_equal.SF-2678502.stable.out
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
sql/test/BugTracker-2009/Tests/push_select_down_crash.stable.out
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker-2010/Tests/crash_on_where_in.Bug-2333.stable.out
sql/test/BugTracker-2010/Tests/order_by_on_single_row_view.SF-2950453.stable.out
sql/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out
sql/test/BugTracker-2011/Tests/case-when-alias.Bug-2848.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker/Tests/assert_fails_on_algebra_version.SF-2019349.stable.out
sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
sql/test/BugTracker/Tests/crash_on_delete.SF-1639108.stable.out
sql/test/BugTracker/Tests/crash_on_delete.SF-1651567.stable.out
sql/test/BugTracker/Tests/crash_on_insert.SF-1639113.stable.out
sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Skyserver/Tests/Skyserver.stable.out
sql/test/Tests/coalesce.stable.out
sql/test/Tests/order_by_complex_exp.stable.out
sql/test/VOC/Tests/VOC.stable.out
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/select_from_values.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/bugs/Tests/subselect_single_value-bug-sf-941791.stable.out
sql/test/bugs/Tests/subselect_union-bug-sf-941826.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out
sql/test/bugs/Tests/union_all_where_1=1-bug-sf-936386.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out
sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
sql/test/pg_regress/Tests/char.stable.out
sql/test/pg_regress/Tests/strings_concat.stable.out
sql/test/pg_regress/Tests/text.stable.out
sql/test/pg_regress/Tests/varchar.stable.out
sql/test/rdf/Tests/q2_28_v.stable.out
sql/test/rdf/Tests/q2_v.stable.out
sql/test/rdf/Tests/q3_28_v.stable.out
sql/test/rdf/Tests/q3_v.stable.out
sql/test/rdf/Tests/q4_28_v.stable.out
sql/test/rdf/Tests/q4_v.stable.out
sql/test/rdf/Tests/q6_28_v.stable.out
sql/test/rdf/Tests/q6_v.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
testing/Mtest.py.in
tools/mserver/mserver5.c
Branch: sciql
Log Message:
merged with default
diffs (truncated from 8172 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -143,11 +143,28 @@ MonetDB, you will very likely need this
%defattr(-,root,root)
%{_bindir}/mclient
%{_bindir}/msqldump
-%{_bindir}/stethoscope
%{_libdir}/libmapi.so.*
%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 = %{version}-%{release}
+
+%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 frontend.
+
+This package contains stethoscope and tomograph.
+
+%files client-tools
+%defattr(-,root,root)
+%{_bindir}/stethoscope
+%{_bindir}/tomograph
+
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
@@ -691,7 +708,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
# .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la
# internal development stuff
-rm -f $RPM_BUILD_ROOT%{_bindir}/calibrator
rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.so
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -231,6 +231,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_3B793520B49D47C18CC14D2B737DA38C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1721,6 +1727,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\75_storagemodel.sql"
+ "TargetName" = "8:75_storagemodel.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B793520B49D47C18CC14D2B737DA38C"
{
"SourcePath" = "8:lib\\monetdb5\\microbenchmark.mal"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -369,12 +369,6 @@
}
"Entry"
{
- "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_6B9091C26D034EFD92BB0864ADB05B61"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -699,6 +693,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_BE5D88D9A25C4ED1A987747ABA28C358"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_BF77ED0A7E9C49478C26BAF11A3F2C37"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -915,6 +915,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_FF4ED691FBAF49DEA4726DF1C1C90785"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2181,26 +2187,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
- {
- "SourcePath" = "8:lib\\monetdb5\\iterator.mal"
- "TargetName" = "8:iterator.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6B9091C26D034EFD92BB0864ADB05B61"
{
"SourcePath" = "8:lib\\monetdb5\\json.mal"
@@ -3261,6 +3247,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BE5D88D9A25C4ED1A987747ABA28C358"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\75_storagemodel.sql"
+ "TargetName" = "8:75_storagemodel.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF77ED0A7E9C49478C26BAF11A3F2C37"
{
"SourcePath" = "8:lib\\monetdb5\\constraints.mal"
@@ -3981,6 +3987,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\iterator.mal"
+ "TargetName" = "8:iterator.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FF4ED691FBAF49DEA4726DF1C1C90785"
{
"SourcePath" = "8:lib\\monetdb5\\lib_udf.dll"
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -183,11 +183,11 @@ PYTHON = python
YACC = bison
LEX = flex
-ARCHIVER = lib
+ARCHIVER = lib /nologo
GENDLL =
RC = rc
-MT = mt -nologo
+MT = mt /nologo
JAVAC = javac
JAR = jar
ANT = ant.bat
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
@@ -1027,7 +1027,7 @@ def msc_python_generic(fd, var, python,
fd.write('\t$(INSTALL) "$(srcdir)\\README.rst" "README.rst"\n')
msc['INSTALL'][f] = f, '', '', '', ''
fd.write('install_%s:\n' % f)
- fd.write('\t$(%s) %s install --prefix "$(prefix)"\n' % (PYTHON, f))
+ fd.write('\t$(%s) %s install --prefix "$(prefix)" --install-lib
"$(prefix)\\lib\\%s\n' % (PYTHON, f, PYTHON.lower()))
def msc_python2(fd, var, python, msc):
msc_python_generic(fd, var, python, msc, 'PYTHON2')
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
@@ -194,8 +194,11 @@ BAT *BATsort(BAT *b);
BAT *BATsort_rev(BAT *b);
BAT *BATssort(BAT *b);
BAT *BATssort_rev(BAT *b);
+gdk_return BATsubleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, BUN estimate);
+gdk_return BATsubouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, BUN estimate);
BAT *BATsubselect(BAT *b, BAT *s, const void *tl, const void *th, int li, int
hi, int anti);
gdk_return BATsubsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o,
BAT *g, int reverse, int stable);
+gdk_return BATsubthetajoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT
*sr, const char *op, BUN estimate);
gdk_return BATsum(void *res, int tp, BAT *b, BAT *s, int skip_nils, int
abort_on_error, int nil_if_empty);
BAT *BATsunion(BAT *b, BAT *c);
BAT *BATsunique(BAT *b);
@@ -276,10 +279,6 @@ int GDKnr_threads;
void GDKqsort(void *h, void *t, const void *base, size_t n, int hs, int ts,
int tpe);
void GDKqsort_rev(void *h, void *t, const void *base, size_t n, int hs, int
ts, int tpe);
void *GDKrealloc(void *pold, size_t size);
-ATOMIC_TYPE volatile GDKsemacnt;
-MT_Sema *volatile GDKsemalist;
-ATOMIC_TYPE volatile GDKsemasleepcnt;
-ATOMIC_TYPE volatile GDKsemawaitcnt;
void GDKsetenv(str name, str value);
ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
str GDKstrdup(const char *s);
@@ -825,6 +824,10 @@ str ALGssort(int *result, int *bid);
str ALGssort_rev(int *result, int *bid);
str ALGstdev(dbl *res, int *bid);
str ALGstdevp(dbl *res, int *bid);
+str ALGsubleftjoin(bat *r1, bat *r2, bat *l, bat *r);
+str ALGsubleftjoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr);
+str ALGsubouterjoin(bat *r1, bat *r2, bat *l, bat *r);
+str ALGsubouterjoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr);
str ALGsubsample(int *result, int *bid, int *param);
str ALGsubselect1(bat *result, bat *bid, const void *low, const void *high,
const bit *li, const bit *hi, const bit *anti);
str ALGsubselect2(bat *result, bat *bid, bat *sid, const void *low, const void
*high, const bit *li, const bit *hi, const bit *anti);
@@ -838,6 +841,8 @@ str ALGsubsort23(bat *result, bat *norde
str ALGsubsort31(bat *result, bat *bid, bat *order, bat *group, bit *reverse,
bit *stable);
str ALGsubsort32(bat *result, bat *norder, bat *bid, bat *order, bat *group,
bit *reverse, bit *stable);
str ALGsubsort33(bat *result, bat *norder, bat *ngroup, bat *bid, bat *order,
bat *group, bit *reverse, bit *stable);
+str ALGsubthetajoin(bat *r1, bat *r2, bat *l, bat *r, str *op);
+str ALGsubthetajoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr, str
*op);
str ALGsunion(int *result, int *lid, int *rid);
str ALGsunique(int *result, int *bid);
str ALGtdiff(int *result, int *lid, int *rid);
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2566,7 +2566,7 @@ set_timezone(Mapi mid)
gt = mktime(tmp);
tmp = localtime(&t);
lt = mktime(tmp);
- assert((lng) (gt - lt) >= (lng) INT_MIN && (lng) (gt - lt) <= (lng)
INT_MAX);
+ assert((lng) gt - (lng) lt >= (lng) INT_MIN && (lng) gt - (lng) lt <=
(lng) INT_MAX);
tzone = (int) (gt - lt);
if (tzone < 0)
snprintf(buf, sizeof(buf),
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1883,7 +1883,8 @@ static void *
doProfile(void *d)
{
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
