MonetDB: default - Merge with Jun2010 branch.
Changeset: 4a8a7f464e53 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a8a7f464e53 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (12 lines): diff -r 80e68b747391 -r 4a8a7f464e53 sql/ChangeLog-Archive --- a/sql/ChangeLog-Archive Mon Aug 30 11:46:29 2010 +0200 +++ b/sql/ChangeLog-Archive Mon Aug 30 11:47:11 2010 +0200 @@ -3,7 +3,7 @@ * Fri Aug 20 2010 Sjoerd Mullender sjo...@acm.org - 2.38.5-20100823 - Fixed a case where the optimizer incorrectly removed an expression. - This fixes bu 2602. + This fixes bug 2602. - Fix a crash in prepared statements when a parameter is on the left-hand side of a binary operator. This fixes bug 2599. - Fixed reporting of a violated foreign key constraint. This fixes ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: eb65fd02d465 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb65fd02d465
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (38 lines):
diff -r 4a8a7f464e53 -r eb65fd02d465 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Mon Aug 30 11:47:11 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Mon Aug 30 14:41:28 2010 +0200
@@ -1,3 +1,8 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon Aug 30 2010 Sjoerd Mullender sjo...@acm.org
+- When attempting to insert incorrect UTF-8 sequences in a COPY INTO
+ statement, the error message was truncated. This is now fixed.
+ Bug 2575.
+
diff -r 4a8a7f464e53 -r eb65fd02d465 MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mxMon Aug 30 11:47:11 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mxMon Aug 30 14:41:28 2010 +0200
@@ -166,12 +166,16 @@
char *val;
val = *s ? GDKstrdup(s) : GDKstrdup();
if ( *err == NULL){
- snprintf(buf, BUFSIZ, value '%.*s%s' from line
BUNFMT
- field %d not inserted, expecting
type %s\n,
-BUFSIZ - 200, val,
-strlen(val) (size_t) BUFSIZ - 200 ?
... : ,
-BATcount(fmt-c[0])+1,
-col, fmt-type);
+ if (snprintf(buf, BUFSIZ, value '%.*s%s' from line
BUNFMT
+ field %d not inserted,
expecting type %s\n,
+BUFSIZ - 200, val,
+strlen(val) (size_t) BUFSIZ
- 200 ? ... : ,
+BATcount(fmt-c[0])+1,
+col, fmt-type) 0)
+ snprintf(buf, BUFSIZ, value from line BUNFMT
+ field %d not inserted,
expecting type %s\n,
+BATcount(fmt-c[0])+1,
+col, fmt-type);
*err= GDKstrdup(buf);
}
GDKfree(val);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 4b7de918e706 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b7de918e706
Modified Files:
MonetDB5/src/mal/mal_scenario.mx
sql/src/backends/monet5/sql_scenario.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (35 lines):
diff -r 0c493ed52585 -r 4b7de918e706 MonetDB5/src/mal/mal_scenario.mx
--- a/MonetDB5/src/mal/mal_scenario.mx Mon Aug 30 14:54:09 2010 +0200
+++ b/MonetDB5/src/mal/mal_scenario.mx Mon Aug 30 17:00:00 2010 +0200
@@ -623,7 +623,7 @@
if (setjmp( c-exception_buf) 0)
c-mode = FINISHING;
#ifdef HAVE_TIMES
- times(t0);
+ times(t0);
#endif
while (c-mode FINISHING || msg != MAL_SUCCEED) {
if (msg != MAL_SUCCEED){
diff -r 0c493ed52585 -r 4b7de918e706 sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx Mon Aug 30 14:54:09 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx Mon Aug 30 17:00:00 2010 +0200
@@ -1306,6 +1306,10 @@
m-type,/* the type of the statement
*/
sql_escape_str(QUERY(m-scanner)));
+ /* passed over to query cache */
+ m-sa = NULL;
+ m-sym = NULL;
+
scanner_query_processed((m-scanner));
be-q-code =
(backend_code)backend_dumpproc(be, c, be-q, s);
@@ -1314,8 +1318,6 @@
be-q-name = putName(be-q-name, strlen(be-q-name));
if (m-emode == m_normal m-emod == mod_none)
m-emode = m_inplace;
- m-sa = NULL;
- m-sym = NULL;
}
stmt_destroy(s);
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: a9294382f85d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9294382f85d Modified Files: sql/ChangeLog.Jun2010 Branch: default Log Message: Merge with Jun2010 branch. diffs (11 lines): diff -r 4b7de918e706 -r a9294382f85d sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Mon Aug 30 17:00:00 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Mon Aug 30 17:04:06 2010 +0200 @@ -1,3 +1,7 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Mon Aug 30 2010 Sjoerd Mullender sjo...@acm.org +- Fixed a crash of the server when an extremely complex query is + attempted. This is the latest incarnation of bug 104. + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch (no changes).
Changeset: 68703bed9e26 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68703bed9e26 Modified Files: sql/src/test/BugDay_2005-10-06_2.9.3/Tests/All Branch: default Log Message: Merge with Jun2010 branch (no changes). ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 720299d37a72 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=720299d37a72
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
buildtools/conf/MonetDB.m4
clients/MonetDB-client.spec
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/MonetDB-geom.spec
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (298 lines):
diff -r e3a7325c15e4 -r 720299d37a72 .hgtags
--- a/.hgtags Tue Aug 24 09:28:58 2010 +0200
+++ b/.hgtags Tue Aug 24 10:40:44 2010 +0200
@@ -422,3 +422,5 @@
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
+19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
+931928c216bc600a35580fa19f73daac66bd3571 Jun2010_5
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Aug 24 10:40:44 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Aug 24 2010 Sjoerd Mullender sjo...@acm.org - 1.38.5-20100824
+- Rebuilt.
+
* Mon Aug 23 2010 Sjoerd Mullender sjo...@acm.org - 1.38.5-20100823
- Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB/debian/changelog Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.5-20100824) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 24 Aug 2010 09:30:18 +0200
+
monetdb (1.38.5-20100823) unstable; urgency=low
* Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/ChangeLog-Archive
--- a/MonetDB4/ChangeLog-ArchiveTue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/ChangeLog-ArchiveTue Aug 24 10:40:44 2010 +0200
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Aug 24 2010 Sjoerd Mullender sjo...@acm.org - 4.38.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
* Thu Jul 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.5-20100823
- Slight change to Fedora, Debian, Ubuntu installers: the database
directory now has the group setuid bit set so that new databases
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010Tue Aug 24 10:40:44 2010 +0200
@@ -1,7 +1,3 @@
# ChangeLog file for MonetDB4
# This file is updated with Maddlog
-* Tue Aug 24 2010 Sjoerd Mullender sjo...@acm.org
-- Fixed a crash when calculating certain aggregates on platforms where
- non-aligned data access is not allowed (e.g. Sparc).
-
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Aug 24 10:40:44 2010 +0200
@@ -217,6 +217,13 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Aug 24 2010 Sjoerd Mullender sjo...@acm.org - 4.38.5-20100824
+- Rebuilt.
+
+* Tue Aug 24 2010 Sjoerd Mullender sjo...@acm.org - 4.38.5-20100824
+- Fixed a crash when calculating certain aggregates on platforms where
+ non-aligned data access is not allowed (e.g. Sparc).
+
* Mon Aug 23 2010 Sjoerd Mullender sjo...@acm.org - 4.38.5-20100823
- Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Aug 24 09:28:58 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Aug 24 10:40:44 2010 +0200
@@ -1,3 +1,16 @@
+monetdb4-server (4.38.5-20100824) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 24 Aug 2010 09:30:18 +0200
+
+monetdb4-server (4.38.5-20100824) unstable; urgency=low
+
+ * Fixed a crash when calculating certain aggregates on platforms where
+non-aligned data access is not allowed (e.g. Sparc).
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 24 Aug 2010 09:30:18 +0200
+
monetdb4-server (4.38.5-20100823) unstable; urgency=low
* Rebuilt.
diff -r e3a7325c15e4 -r 720299d37a72 MonetDB5/ChangeLog-Archive
--- a/MonetDB5/ChangeLog-ArchiveTue Aug 24 09:28:58 2010 +0200
+++
MonetDB: default - Merge with Jun2010 branch.
Changeset: e13b7117093b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e13b7117093b
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
buildtools/conf/MonetDB.m4
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 1228 to 300 lines):
diff -r fec324448e55 -r e13b7117093b .hgtags
--- a/.hgtags Mon Aug 23 09:48:20 2010 +0200
+++ b/.hgtags Mon Aug 23 10:41:27 2010 +0200
@@ -421,3 +421,4 @@
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
+19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
diff -r fec324448e55 -r e13b7117093b MonetDB/ChangeLog-Archive
--- a/MonetDB/ChangeLog-Archive Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/ChangeLog-Archive Mon Aug 23 10:41:27 2010 +0200
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Aug 20 2010 Sjoerd Mullender sjo...@acm.org - 1.38.5-20100823
+- Fixed a bug where some internal reference counting was done incorrectly,
+ causing an infinite loop when exiting the server due to it being killed.
+ This bug probably only manifested itself in MonetDB/XQuery. Bug 2658.
+
* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100618
- Updated Vendor information.
diff -r fec324448e55 -r e13b7117093b MonetDB/ChangeLog.Jun2010
--- a/MonetDB/ChangeLog.Jun2010 Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/ChangeLog.Jun2010 Mon Aug 23 10:41:27 2010 +0200
@@ -1,8 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Fri Aug 20 2010 Sjoerd Mullender sjo...@acm.org
-- Fixed a bug where some internal reference counting was done incorrectly,
- causing an infinite loop when exiting the server due to it being killed.
- This bug probably only manifested itself in MonetDB/XQuery. Bug 2658.
-
diff -r fec324448e55 -r e13b7117093b MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon Aug 23 10:41:27 2010 +0200
@@ -26,7 +26,7 @@
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
URL: http://monetdb.cwi.nl/
-Source:
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/%{name}-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010-SP2/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -106,6 +106,14 @@
%{_libdir}/libbat.so
%changelog
+* Mon Aug 23 2010 Sjoerd Mullender sjo...@acm.org - 1.38.5-20100823
+- Rebuilt.
+
+* Fri Aug 20 2010 Sjoerd Mullender sjo...@acm.org - 1.38.5-20100823
+- Fixed a bug where some internal reference counting was done incorrectly,
+ causing an infinite loop when exiting the server due to it being killed.
+ This bug probably only manifested itself in MonetDB/XQuery. Bug 2658.
+
* Tue Jul 13 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100713
- Rebuilt.
diff -r fec324448e55 -r e13b7117093b MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/debian/changelog Mon Aug 23 10:41:27 2010 +0200
@@ -1,3 +1,17 @@
+monetdb (1.38.5-20100823) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Mon, 23 Aug 2010 10:13:12 +0200
+
+monetdb (1.38.5-20100823) unstable; urgency=low
+
+ * Fixed a bug where some internal reference counting was done incorrectly,
+causing an infinite loop when exiting the server due to it being killed.
+This bug probably only manifested itself in MonetDB/XQuery. Bug 2658.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 20 Aug 2010 10:13:11 +0200
+
monetdb (1.38.3-20100713) unstable; urgency=low
* Rebuilt.
diff -r fec324448e55 -r e13b7117093b MonetDB4/ChangeLog-Archive
--- a/MonetDB4/ChangeLog-ArchiveMon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB4/ChangeLog-ArchiveMon Aug 23 10:41:27 2010 +0200
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Jul 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.5-20100823
+- Slight change to Fedora, Debian, Ubuntu installers: the database
+ directory now has the group setuid bit set so that new databases
+ inherit the group ownership (monetdb).
+
* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100618
- Updated Vendor information.
diff -r fec324448e55 -r e13b7117093b MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010Mon Aug 23 10:41:27 2010 +0200
@@
MonetDB: default - merge with Jun2010 branch
Changeset: fa4a6f5a4666 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa4a6f5a4666
Modified Files:
Branch: default
Log Message:
merge with Jun2010 branch
diffs (10 lines):
diff -r 81c33e1c5e34 -r fa4a6f5a4666
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
--- a/sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
Thu Aug 19 22:13:03 2010 +0200
+++ b/sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
Fri Aug 20 08:46:58 2010 +0200
@@ -6,3 +6,6 @@
os.path.pardir,
'insert-null-byte.sql')))
c.communicate()
+
+c = process.client('sql', stdin = process.PIPE)
+c.communicate('drop table strings2233581;')
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: dbdb607487e1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbdb607487e1 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (12 lines): diff -r 78725207a0c8 -r dbdb607487e1 sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err --- a/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err Fri Aug 20 12:49:36 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err Fri Aug 20 13:16:30 2010 +0200 @@ -75,7 +75,7 @@ QUERY = COPY 1 RECORDS INTO t FROM STDIN USING DELIMITERS '|',' ','' NULL AS '';abcd -ERROR = !SQLException:importTable:value 'abcd' from line 1 field 1 not inserted, expecting type str +ERROR = !SQLException:importTable:value 'abcd' from line 1 field 1 not inserted, value too long for type (var)char(3) !failed to import table # 15:34:26 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 7ce79e5e8afe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ce79e5e8afe Modified Files: java/ChangeLog.Aug2009 java/ChangeLog.Feb2010 java/ChangeLog.Nov2009 sql/src/backends/monet5/merovingian/ChangeLog.Aug2009 sql/src/backends/monet5/merovingian/ChangeLog.Feb2010 sql/src/backends/monet5/merovingian/ChangeLog.Nov2009 Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 1483 to 300 lines): diff -r e782d77127be -r 7ce79e5e8afe MonetDB/ChangeLog-Archive --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/MonetDB/ChangeLog-Archive Fri Aug 20 15:12:21 2010 +0200 @@ -0,0 +1,78 @@ +# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY +# This file contains past ChangeLog entries + +* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100618 +- Updated Vendor information. + +* Tue Apr 20 2010 Stefan Manegold maneg...@cwi.nl - 1.38.1-20100618 +- Made compilation of testing (and java) independent of MonetDB. + This is mainly for Windows, but also on other systems, testing can + now be built independently of (and hence before) MonetDB. Files + that mimic configure functionality on Windows were moved from + MonetDB to buildtools; hence, this affects all packages on + Windows, requiring a complete rebuild from scratch on Windows. + getopt() support in testing has changed; hence, (most probably) + requiring a rebuild from scratch of testing on other systems. + +* Tue Apr 20 2010 Stefan Manegold maneg...@cwi.nl - 1.38.1-20100618 +- Implemented build directory support for Windows, i.e., like on + Unix/Linux also on Windows we can now build in a separate build + directory as alternative to ...\package\NT, and thus keep the latter + clean from files generated during the build. On Windows, the build + directory must be a sibling of ...\package\NT . + +* Thu Apr 15 2010 Sjoerd Mullender sjo...@acm.org - 1.36.5-20100420 +- Fixed a bug that could cause a crash when string BATs are combined. + (SF bug 2947763.) + +* Sun Apr 11 2010 Niels Nes ni...@cwi.nl - 1.36.5-20100420 +- Fixed a potential file leak: under certain conditions, files in the + database might not get deleted when they should (they would be + deleted when the server restarts). + +* Mon Mar 29 2010 Fabian Groffen fab...@cwi.nl - 1.36.5-20100420 +- Fix regression introduced in Feb2010-SP1 causing UDP connections to + malfunction, in particular affecting the stethoscope tool. + +* Mon Mar 01 2010 Fabian Groffen fab...@cwi.nl - 1.36.3-20100322 +- Fixed bug in UDP stream creation causing UDP connections to already + bound ports to be reported as successful. + +* Mon Feb 22 2010 Sjoerd Mullender sjo...@acm.org - 1.36.1-20100223 +- Various concurrency bugs were fixed. +- Various changes were made to run better on systems that don't have + enough memory to keep everything in core that was touched during + query processing. This is done by having the higher layers giving + hints to the database kernel about future use, and the database + kernel giving hings to the operating system kernel about how + (virtual) memory is going to be used. + +* Thu Feb 18 2010 Stefan Manegold stefan.maneg...@cwi.nl - 1.36.1-20100223 +- Fixed bug in mergejoin implementation. This fixes bug #2952191. + +* Tue Feb 2 2010 Sjoerd Mullender sjo...@acm.org - 1.36.1-20100223 +- Added support for compiling on Windows using the Cygwin-provided + version of flex. + +* Thu Jan 21 2010 Sjoerd Mullender sjo...@acm.org - 1.36.1-20100223 +- Fix compilation issue when configured with --with-curl. This fixes + bug #2924999. + +* Thu Jan 21 2010 Fabian Groffen fab...@cwi.nl - 1.36.1-20100223 +- Added implementation of MT_getrss() for Solaris. This yields in the + kernel knowing about its (approximate) memory usage to try and help + the operating system to free that memory that is best to free, + instead of a random page, e.g. the work of the vmtrim thread. + +* Wed Jan 20 2010 Sjoerd Mullender sjo...@cwi.nl - 1.36.1-20100223 +- Implemented a fast string BAT append: Under certain conditions, + instead of inserting values one-by-one, we now concatenate the + string heap wholesale and just manipulate the offsets. This works + both for BATins and BATappend. + +* Wed Jan 6 2010 Sjoerd Mullender sjo...@cwi.nl - 1.36.1-20100223 +- Changed the string heap implementation to also contain the hashes of + strings. +- Changed the implementation of the string offset columns to be + dynamically sized. + diff -r e782d77127be -r 7ce79e5e8afe MonetDB4/ChangeLog-Archive --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/MonetDB4/ChangeLog-ArchiveFri Aug 20 15:12:21 2010 +0200 @@ -0,0 +1,23 @@ +# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY +# This file contains past ChangeLog entries + +* Mon May 31 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100618 +- Updated Vendor information. + +* Tue Apr 20 2010 Stefan Manegold maneg...@cwi.nl - 4.38.1-20100618 +-
MonetDB: default - Merge with Jun2010 branch.
Changeset: 134cdc4cc0c4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=134cdc4cc0c4 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 506 to 300 lines): diff -r 7ce79e5e8afe -r 134cdc4cc0c4 sql/src/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.sql --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.sql Fri Aug 20 17:04:56 2010 +0200 @@ -0,0 +1,492 @@ +-- +-- Table structure for table payments +-- + +CREATE TABLE payments ( + id integer, + order_id integer default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + amount decimal(8,2) NOT NULL default '0.00', + creditcard_id integer default NULL, + paytype varchar(255) default NULL +); + +-- +-- Table structure for table addresses +-- + +CREATE TABLE addresses ( + id integer, + firstname varchar(255) default NULL, + lastname varchar(255) default NULL, + address1 varchar(255) default NULL, + address2 varchar(255) default NULL, + city varchar(255) default NULL, + state_id integer default NULL, + zipcode varchar(255) default NULL, + country_id integer default NULL, + phone varchar(255) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + state_name varchar(255) default NULL +); + +-- +-- Table structure for table countries +-- + +CREATE TABLE countries ( + id integer, + iso_name varchar(255) default NULL, + iso varchar(255) default NULL, + name varchar(255) default NULL, + iso3 varchar(255) default NULL, + numcode integer default NULL +); + +-- +-- Table structure for table line_items +-- + +CREATE TABLE line_items ( + id integer, + order_id integer default NULL, + variant_id integer default NULL, + quantity integer NOT NULL, + price decimal(8,2) NOT NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL +); + +-- +-- Table structure for table orders +-- + +CREATE TABLE orders ( + id integer default NULL, + user_id integer default NULL, + number varchar(255) default NULL, + ship_amount decimal(8,2) NOT NULL default '0.00', + tax_amount decimal(8,2) NOT NULL default '0.00', + item_total decimal(8,2) NOT NULL default '0.00', + total decimal(8,2) NOT NULL default '0.00', + ip_address varchar(255) default NULL, + special_instructions text, + created_at timestamp default NULL, + updated_at timestamp default NULL, + state varchar(255) default NULL, + checkout_complete integer default NULL, + token varchar(255) default NULL, + email varchar(255) default NULL, + bill_address_id integer default NULL, + ship_address_id integer default NULL +); + +-- +-- Table structure for table products +-- + +CREATE TABLE products ( + id integer default NULL, + name varchar(255) NOT NULL default '', + description text, + master_price decimal(8,2) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + permalink varchar(255) default NULL, + available_on timestamp default NULL, + tax_category_id integer default NULL, + shipping_category integer default NULL, + deleted_at timestamp default NULL, + meta_description varchar(255) default NULL, + meta_keywords varchar(255) default NULL +); + +-- +-- Table structure for table schema_migrations +-- + +CREATE TABLE schema_migrations ( + version varchar(255) NOT NULL +); + +-- +-- Table structure for table shipments +-- + +CREATE TABLE shipments ( + id integer, + order_id integer default NULL, + shipping_method_id integer default NULL, + tracking varchar(255) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + number varchar(255) default NULL, + cost decimal(8,2) default NULL, + shipped_at timestamp default NULL, + address_id integer default NULL +); + +-- +-- Table structure for table shipping_methods +-- + +CREATE TABLE shipping_methods ( + id integer, + zone_id integer default NULL, + shipping_calculator varchar(255) default NULL, + name varchar(255) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL +); + +-- +-- Table structure for table states +-- + +CREATE TABLE states ( + id integer, + name varchar(255) default NULL, + abbr varchar(255) default NULL, + country_id integer default NULL +); + +-- +-- Table structure for table tax_categories +-- + +CREATE TABLE tax_categories ( + id integer, + name varchar(255) default NULL, + description varchar(255) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL +); + +-- +-- Table structure for table tax_rates +-- + +CREATE TABLE tax_rates ( + id integer default NULL, + zone_id integer default NULL, + amount decimal(8,4) default NULL, + created_at timestamp default NULL, + updated_at timestamp default NULL, + tax_type integer default NULL, + tax_category_id integer default NULL +); + +-- +-- Table structure for
MonetDB: default - Merge with Jun2010 branch.
Changeset: 3ca8f0ffca39 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ca8f0ffca39
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (124 lines):
diff -r b355aba116d3 -r 3ca8f0ffca39 clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Wed Aug 18 21:36:05 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Thu Aug 19 10:07:20 2010 +0200
@@ -1,9 +1,16 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Thu Aug 19 2010 Sjoerd Mullender sjo...@acm.org
+- mclient now complains about NULL bytes in the input when in interactive
+ mode.
+
* Fri Aug 13 2010 Fabian Groffen fab...@cwi.nl
-- Slight rendering improvements to mclient's tabular output when rendering
results larger than the available screen width, headers were previously
unnecessarily squeezed.
-- Fix bug #2650, a too small buffer caused the active database as reported by
mclient's welcome message to be truncated
+- Slight rendering improvements to mclient's tabular output when
+ rendering results larger than the available screen width, headers
+ were previously unnecessarily squeezed.
+- Fix bug #2650, a too small buffer caused the active database as
+ reported by mclient's welcome message to be truncated
* Wed Jul 21 2010 Fabian Groffen fab...@cwi.nl
- Add --version option to mclient.
diff -r b355aba116d3 -r 3ca8f0ffca39 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Aug 18 21:36:05 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Aug 19 10:07:20 2010 +0200
@@ -1801,7 +1801,7 @@
MapiHdl hdl = mapi_get_active(mid);
MapiMsg rc = MOK;
int sent = 0; /* whether we sent any data to the server */
- int first = 1; /* first line processing */
+ int lineno = 1;
#ifdef HAVE_LIBREADLINE
if (prompt == NULL)
@@ -1809,6 +1809,10 @@
oldbuf = buf = malloc(BUFSIZ);
do {
+ if (prompt) {
+ /* clear errors when interactive */
+ errseen = 0;
+ }
mnstr_flush(toConsole);
timerPause();
#ifdef HAVE_LIBREADLINE
@@ -1837,6 +1841,8 @@
} else
#endif
{
+ int c = 0;
+
#ifndef HAVE_LIBREADLINE
if (prompt) {
fputs(hdl ? more : prompt, stdout);
@@ -1846,11 +1852,35 @@
if (buf != oldbuf)
free(buf);
buf = oldbuf;
- line = fgets(buf, BUFSIZ, fp);
- }
- if (prompt) {
- /* clear errors when interactive */
- errseen = 0;
+ line = buf;
+ while (line buf + BUFSIZ - 1
+ (c = getc(fp)) != EOF) {
+ if (c == 0) {
+ fprintf(stderr, NULL byte in input on
line %d of input\n, lineno);
+ /* read away rest of line */
+ while ((c = getc(fp)) != EOF
+ c != '\n')
+ ;
+ errseen = 1;
+ c = 0x1234; /* indicate error */
+ if (hdl) {
+ mapi_close_handle(hdl);
+ hdl = NULL;
+ }
+ break;
+ }
+ *line++ = c;
+ if (c == '\n')
+ break;
+ }
+ if (c == 0x1234)
+ continue;
+ if (line == buf)
+ line = NULL;
+ else {
+ *line = 0;
+ line = buf;
+ }
}
#ifdef HAVE_ICONV
if (line != NULL encoding != NULL cd_in != (iconv_t) -1) {
@@ -1871,10 +1901,10 @@
#ifdef HAVE_ICONV
encoding == NULL
#endif
- first
+ lineno == 1
strncmp(line, UTF8BOM, UTF8BOMLENGTH) == 0)
line += UTF8BOMLENGTH; /* skip Byte Order Mark (BOM) */
- first = 0;
+ lineno++;
if (line == NULL ||
(mode == XQUERY line[0] == '' line[1] == '')) {
/* end of file */
diff -r b355aba116d3 -r 3ca8f0ffca39
MonetDB: default - Merge with Jun2010 branch.
Changeset: a23de431529b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a23de431529b Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (46 lines): diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests Thu Aug 19 10:07:52 2010 +0200 @@ -0,0 +1,1 @@ +AVG_of_SQRT.SF-2757642.unpack_csv diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out --- a/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out Thu Aug 19 10:07:20 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out Thu Aug 19 10:07:52 2010 +0200 @@ -30,7 +30,8 @@ % L1, L2, single_value, L3, single_value, L4 # name % char,wrd,char, double, char, double # type % 22, 9, 15, 22, 20, 22 # length -[ count(n8) == 1,1, avg(n8) == 1.21, 1.20998,avg(sqrt(n8)) == 1.1, 1.09998 ] +[ count(n8) == 1,1, avg(n8) == 1.21, 1.21001,avg(sqrt(n8)) == 1.1, 1.09998 ] +#select 'avg(sqrt(n8)) == 1.1', avg(sqrt(a)) from n8; % .L11,sys. # table_name % L11, L12 # name % char,double # type diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/All --- a/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 10:07:20 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 10:07:52 2010 +0200 @@ -48,13 +48,13 @@ TribooleanFailureWithSubquery.SF-2679434 nullstr.SF-2704016 POWER_vs_prod.SF-2596114 -#parallel_bulk-load.SF-2771052.unpack_csv -#parallel_bulk-load.SF-2771052.test -#parallel_bulk-load.SF-2771052.clean +parallel_bulk-load.SF-2771052.unpack_csv +parallel_bulk-load.SF-2771052.test +parallel_bulk-load.SF-2771052.clean wrong_error_message.SF-2637051 -#AVG_of_SQRT.SF-2757642.unpack_csv -#AVG_of_SQRT.SF-2757642.test -#AVG_of_SQRT.SF-2757642.clean +AVG_of_SQRT.SF-2757642.unpack_csv +AVG_of_SQRT.SF-2757642.test +AVG_of_SQRT.SF-2757642.clean missing_column_name.SF-2776100 dumping_tables.SF-2776908 dumping_tables.SF-2776908--performance diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests Thu Aug 19 10:07:52 2010 +0200 @@ -0,0 +1,1 @@ +parallel_bulk-load.SF-2771052.unpack_csv ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 83b10c04d473 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83b10c04d473
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (12 lines):
diff -r f61f6ab3acbb -r 83b10c04d473 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxThu Aug 19 12:38:44 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxThu Aug 19 14:44:59 2010 +0200
@@ -2308,7 +2308,7 @@
BBPdestroy(BAT *b)
{
int clear = 1;
- bat hp = VIEWhparent(b), tp = VIEWtparent(b);
+ bat hp = b-H-heap.parentid, tp = b-T-heap.parentid;
bat vhp = VIEWvhparent(b), vtp = VIEWvtparent(b);
if (isVIEW(b)) {/* a physical view */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - merge with Jun2010 branch
Changeset: 81c33e1c5e34 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81c33e1c5e34 Modified Files: MonetDB/MonetDB.spec MonetDB4/MonetDB-server.spec MonetDB5/MonetDB-server.spec clients/MonetDB-client.spec geom/MonetDB-geom.spec pathfinder/MonetDB-XQuery.spec sql/MonetDB-SQL.spec sql/src/server/rel_select.mx sql/src/test/BugTracker-2010/Tests/All testing/MonetDB-testing.spec Branch: default Log Message: merge with Jun2010 branch diffs (truncated from 451 to 300 lines): diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB/MonetDB.spec Thu Aug 19 22:13:03 2010 +0200 @@ -143,9 +143,9 @@ * Tue Apr 20 2010 Stefan Manegold maneg...@cwi.nl - 1.38.1-20100618 - Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build - directory as alternative to ...packageNT, and thus keep the latter + directory as alternative to ...\package\NT, and thus keep the latter clean from files generated during the build. On Windows, the build - directory must be a sibling of ...packageNT . + directory must be a sibling of ...\package\NT . * Tue Apr 20 2010 Sjoerd Mullender sjo...@acm.org - 1.36.5-20100420 - Rebuilt. diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB/debian/changelog --- a/MonetDB/debian/changelog Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB/debian/changelog Thu Aug 19 22:13:03 2010 +0200 @@ -63,9 +63,9 @@ * Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build -directory as alternative to ...packageNT, and thus keep the +directory as alternative to ...\package\NT, and thus keep the latter clean from files generated during the build. On Windows, -the build directory must be a sibling of ...packageNT . +the build directory must be a sibling of ...\package\NT . -- Stefan Manegold maneg...@cwi.nl Tue, 20 Apr 2010 10:58:37 +0200 diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB4/MonetDB-server.spec --- a/MonetDB4/MonetDB-server.spec Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB4/MonetDB-server.spec Thu Aug 19 22:13:03 2010 +0200 @@ -254,9 +254,9 @@ * Tue Apr 20 2010 Stefan Manegold maneg...@cwi.nl - 4.38.1-20100618 - Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build - directory as alternative to ...packageNT, and thus keep the latter + directory as alternative to ...\package\NT, and thus keep the latter clean from files generated during the build. On Windows, the build - directory must be a sibling of ...packageNT . + directory must be a sibling of ...\package\NT . * Tue Apr 20 2010 Sjoerd Mullender sjo...@acm.org - 4.36.5-20100420 - Rebuilt. diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB4/debian/changelog --- a/MonetDB4/debian/changelog Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB4/debian/changelog Thu Aug 19 22:13:03 2010 +0200 @@ -63,9 +63,9 @@ * Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build -directory as alternative to ...packageNT, and thus keep the +directory as alternative to ...\package\NT, and thus keep the latter clean from files generated during the build. On Windows, -the build directory must be a sibling of ...packageNT . +the build directory must be a sibling of ...\package\NT . -- Stefan Manegold maneg...@cwi.nl Tue, 20 Apr 2010 10:58:37 +0200 diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB5/MonetDB-server.spec --- a/MonetDB5/MonetDB-server.spec Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB5/MonetDB-server.spec Thu Aug 19 22:13:03 2010 +0200 @@ -288,9 +288,9 @@ * Tue Apr 20 2010 Stefan Manegold maneg...@cwi.nl - 5.20.1-20100618 - Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build - directory as alternative to ...packageNT, and thus keep the latter + directory as alternative to ...\package\NT, and thus keep the latter clean from files generated during the build. On Windows, the build - directory must be a sibling of ...packageNT . + directory must be a sibling of ...\package\NT . * Tue Apr 20 2010 Martin Kersten martin.kers...@cwi.nl - 5.20.1-20100618 - The MAL debugger list command has been extended with an optional diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB5/debian/changelog --- a/MonetDB5/debian/changelog Thu Aug 19 18:05:43 2010 +0200 +++ b/MonetDB5/debian/changelog Thu Aug 19 22:13:03 2010 +0200 @@ -122,9 +122,9 @@ * Implemented build directory support for Windows, i.e., like on Unix/Linux also on Windows we can now build in a separate build -directory as alternative to ...packageNT, and thus keep
MonetDB: default - Merge with Jun2010 branch.
Changeset: d36c48c97c35 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d36c48c97c35
Modified Files:
MonetDB5/src/optimizer/opt_mergetable.mx
MonetDB5/src/optimizer/opt_prelude.mx
MonetDB5/src/optimizer/opt_support.mx
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.bat
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.sh
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.bat
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.sh
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.stable.out
sql/src/test/Tests/like_tests.SQL.bat
sql/src/test/Tests/like_tests.SQL.sh
sql/src/test/Tests/null-byte-hang.SQL.bat
sql/src/test/Tests/null-byte-hang.SQL.sh
sql/src/test/Tests/zones2.SQL.bat
sql/src/test/Tests/zones2.SQL.sh
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 1630 to 300 lines):
diff -r ef962eacc773 -r d36c48c97c35 MonetDB5/src/optimizer/opt_mergetable.mx
--- a/MonetDB5/src/optimizer/opt_mergetable.mx Tue Aug 17 12:22:41 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mergetable.mx Tue Aug 17 15:16:43 2010 +0200
@@ -771,7 +771,6 @@
return mtop;
}
-
/* join, also handles the case that mat[m].mm is set, ie that we
have the extend available.
*/
@@ -1618,7 +1617,11 @@
@c
/* only handle simple joins, ie not range/band joins */
- if (match 0 match = 2 isMatJoinOp(p)) {
+ /* For range/band joins (argc == 4), the propagation of oids
+ is different, ie result-head equals head-1st arg,
+ result-tail equals head-2nd/3rd arg */
+
+ if (match 0 match = 2 isMatJoinOp(p) p-argc == 3) {
m = isMATalias(getArg(p,1), mat, mtop);
n = isMATalias(getArg(p,2), mat, mtop);
if ((m = mat_join(mb, p, mat, mtop, m, n)) 0)
@@ -1742,9 +1745,16 @@
getModuleId(p) == aggrRef ||
(getModuleId(p) == algebraRef
(getFunctionId(p) == sortTailRef ||
-getFunctionId(p) == sortReverseTailRef {
+getFunctionId(p) == sortReverseTailRef)) ||
+ (getModuleId(p) == pqueueRef
+ (getFunctionId(p) == topn_minRef ||
+getFunctionId(p) == topn_maxRef {
error++;
goto fail;
+ /* For order (and order related topn)
+ we need a similar 2 phase model as used for group
+ by
+*/
}
@-
The slice operation can also be piggy backed onto the mat.pack using it
diff -r ef962eacc773 -r d36c48c97c35 MonetDB5/src/optimizer/opt_prelude.mx
--- a/MonetDB5/src/optimizer/opt_prelude.mx Tue Aug 17 12:22:41 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_prelude.mx Tue Aug 17 15:16:43 2010 +0200
@@ -129,7 +129,7 @@
opt_export str newRef;
opt_export str oidRef;
opt_export str octopusRef;
-opt_export str openRef;
+opt_export str openRef;
opt_export str optimizerRef;
opt_export str packRef;
opt_export str pack2Ref;
@@ -142,6 +142,7 @@
opt_export str preludeRef;
opt_export str prodRef;
opt_export str postludeRef;
MonetDB: default - Merge with Jun2010 branch.
Changeset: 235b741b4142 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=235b741b4142
Modified Files:
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 645 to 300 lines):
diff -r 48e9b1665879 -r 235b741b4142
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Aug 13 09:27:01
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Aug 13 09:29:08
2010 +0200
@@ -187,7 +187,7 @@
{
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F567DEF0CA64069BF1409C4AC7228E3
{
-SourcePath = 8:C:\\bzip2-1.0.5.win32\\bin\\libbz2.dll
+SourcePath =
8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll
TargetName = 8:libbz2.dll
Tag = 8:
Folder = 8:_AC71646495814C55B03F69019B5070C2
@@ -227,7 +227,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29FE781523A94CBDA5CD53F7A319B4D8
{
-SourcePath = 8:C:\\openssl-0.9.8k.win32\\bin\\ssleay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll
TargetName = 8:ssleay32.dll
Tag = 8:
Folder = 8:_AC71646495814C55B03F69019B5070C2
@@ -267,7 +267,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B
{
-SourcePath = 8:C:\\zlib-1.2.3.win32\\bin\\zlib1.dll
+SourcePath = 8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll
TargetName = 8:zlib1.dll
Tag = 8:
Folder = 8:_AC71646495814C55B03F69019B5070C2
@@ -287,7 +287,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_926BCA1A727C4F29B3DA99D425D895EA
{
-SourcePath = 8:C:\\openssl-0.9.8k.win32\\bin\\libeay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll
TargetName = 8:libeay32.dll
Tag = 8:
Folder = 8:_AC71646495814C55B03F69019B5070C2
@@ -447,7 +447,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614
{
-SourcePath = 8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll
+SourcePath =
8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll
TargetName = 8:iconv.dll
Tag = 8:
Folder = 8:_AC71646495814C55B03F69019B5070C2
diff -r 48e9b1665879 -r 235b741b4142
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Aug 13 09:27:01
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Aug 13 09:29:08
2010 +0200
@@ -207,7 +207,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_43E49CA0EC774DEF94E2596DAC7364FB
{
-SourcePath = 8:C:\\openssl-0.9.8k.win64\\bin\\libeay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\libeay32.dll
TargetName = 8:libeay32.dll
Tag = 8:
Folder = 8:_AC71646495814C55B03F69019B5070C2
@@ -247,7 +247,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B
{
-SourcePath = 8:C:\\zlib-1.2.3.win64\\bin\\zlib1.dll
+SourcePath = 8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll
TargetName = 8:zlib1.dll
Tag = 8:
Folder = 8:_AC71646495814C55B03F69019B5070C2
@@ -267,7 +267,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61BDF3C1EF57820D9544098DD817
{
-SourcePath = 8:C:\\openssl-0.9.8k.win64\\bin\\ssleay32.dll
+SourcePath =
8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\ssleay32.dll
TargetName = 8:ssleay32.dll
Tag = 8:
Folder = 8:_AC71646495814C55B03F69019B5070C2
@@ -407,7 +407,7 @@
}
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DC301A823AB94F7D92F5D30466B8E3B0
{
-SourcePath = 8:C:\\bzip2-1.0.5.win64\\bin\\libbz2.dll
+
MonetDB: default - Merge with Jun2010 branch.
Changeset: fbff9df8f94c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fbff9df8f94c Modified Files: buildtools/doc/windowsbuild.rst Branch: default Log Message: Merge with Jun2010 branch. diffs (176 lines): diff -r aec3ac719f3d -r fbff9df8f94c buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst Fri Aug 13 09:36:24 2010 +0200 +++ b/buildtools/doc/windowsbuild.rst Fri Aug 13 09:47:42 2010 +0200 @@ -24,11 +24,11 @@ In this document we describe how to build the MonetDB suite of programs on Windows using the sources from our source repository at -SourceForge__. This document is mainly targeted at building on +`our server`__. This document is mainly targeted at building on Windows XP on a 32-bit architecture, but there are notes throughout about building on Windows XP x64 which is indicated with Windows64. -__ http://sourceforge.net/projects/monetdb/ +__ http://dev.monetdb.org/hg/MonetDB/ Introduction @@ -158,8 +158,10 @@ - Microsoft Visual Studio .NET 2003 (also known as Microsoft Visual Studio 7); - Microsoft Visual Studio 2005 (also known as Microsoft Visual Studio 8); +- Microsoft Visual Studio 2008 (also known as Microsoft Visual Studio 9.0); - Intel(R) C++ Compiler 9.1 (which actually needs one of the above); -- Intel(R) C++ Compiler 10.1 (which also needs one of the Microsoft compilers). +- Intel(R) C++ Compiler 10.1 (which also needs one of the Microsoft compilers); +- Intel(R) C++ Compiler 11.1 (which also needs one of the Microsoft compilers). Note that the pathfinder component can currently not be compiled with any of the Microsoft compilers. It can be compiled with the Intel @@ -171,6 +173,9 @@ a version that uses the MinGW__ (Minimalist GNU for Windows) package. This is not supported and not further described here. +We currently use Microsoft Visual Studio 2008 and Intel(R) C++ +Compiler Professional 11.1.046. + __ http://www.cygwin.com/ __ http://www.mingw.org/ @@ -198,6 +203,10 @@ link on the left and then on Bison, and get the Setup file and install it. +However, we use the version of bison that comes with Cygwin__. + +__ http://www.cygwin.com/ + Flex @@ -207,6 +216,10 @@ at http://gnuwin32.sourceforge.net/. Click on the Packages link on the left and then on Flex, and get the Setup file and install it. +However, we use the version of bison that comes with Cygwin__. + +__ http://www.cygwin.com/ + Pthreads @@ -302,8 +315,9 @@ the clients component when it needs to talk to a MonetDB5 server. Download the source from http://www.openssl.org/. We used the latest -stable version (0.9.8k). Follow the instructions in the file -``INSTALL.W32`` or ``INSTALL.W64``. +stable version (1.0.0a). Follow the instructions in the file +``INSTALL.W32`` or ``INSTALL.W64``. We used the option +``enable-static-engine`` as described in the instructions. Fix the ``OPENSSL`` definitions in ``buildtools\conf\winrules.msc`` so that they refer to the location where you installed the library and @@ -325,19 +339,17 @@ Install these in e.g. ``C:\``. Note that we hit a bug in version 2.6.31 of libxml2. See the -bugreport__. Use version 2.6.30 or 2.6.32. +bugreport__. Use version 2.6.30 or 2.6.32 or later. On Windows64 you will have to compile libxml2 yourself (with its optional prerequisites iconv_ and zlib_, for which see below). -Edit the file ``win32\Makefile.msvc`` and change the one occurrence of -``zdll.lib`` to ``zlib1.lib``, and then run the following commands in -the ``win32`` subfolder, substituting the correct locations for the -iconv and zlib libraries:: +Run the following commands in the ``win32`` subfolder, substituting +the correct locations for the iconv and zlib libraries:: - cscript configure.js compiler=msvc prefix=C:\libxml2-2.6.30.win64 ^ - include=C:\iconv-1.11.win64\include;C:\zlib-1.2.3.win64\include ^ - lib=C:\iconv-1.11.win64\lib;C:\zlib-1.2.3.win64\lib iconv=yes zlib=yes + cscript configure.js compiler=msvc prefix=C:\libxml2-2.7.7.win64 ^ + include=C:\iconv-1.11.win64\include;C:\zlib-1.2.5.win64\include ^ + lib=C:\iconv-1.11.win64\lib;C:\zlib-1.2.5.win64\lib iconv=yes zlib=yes nmake /f Makefile.msvc nmake /f Makefile.msvc install @@ -345,7 +357,7 @@ ``lib`` folder to the ``bin`` folder. __ http://xmlsoft.org/ -__ https://sourceforge.net/tracker/index.php?func=detailaid=1899258group_id=56967atid=482468 +__ http://bugs.monetdb.org/1600 geos (Geometry Engine Open Souce) - @@ -428,25 +440,24 @@ http://www.zlib.net/, but Windows binaries can be gotten from the same site as the libxml2 library: http://www.zlatkovic.com/libxml.en.html. Click on Win32 Binaries on the right, and download zlib. Install in -e.g. ``C:\``. +e.g. ``C:\``. Note that the at the time of writing, the precompiled +version lags behind: it is version 1.2.3, whereas 1.2.5 is current. On Windows64 you will have to compile zlib
MonetDB: default - Merge with Jun2010 branch.
Changeset: 45c1f030e31d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45c1f030e31d
Modified Files:
sql/ChangeLog.Jun2010
sql/src/common/sql_types.mx
sql/src/server/rel_exp.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 583 to 300 lines):
diff -r 65a029afacb5 -r 45c1f030e31d MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Thu Aug 12 12:44:23 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Thu Aug 12 22:43:43 2010 +0200
@@ -3,7 +3,7 @@
* Fri Jul 30 2010 Niels Nes ni...@cwi.nl
- Fixed bug 2557. There was a bug in the mergetable optimizer which was
- triggered by multi column (atleast 32 columns).
+ triggered by multi column (at least 32 columns).
* Wed Jul 28 2010 Martin Kersten m...@cwi.nl
- Added missing multiplex version of MAL str.stringlength().
diff -r 65a029afacb5 -r 45c1f030e31d sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Thu Aug 12 12:44:23 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Thu Aug 12 22:43:43 2010 +0200
@@ -1,6 +1,11 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Thu Aug 12 2010 Niels Nes ni...@cwi.nl
+- Fixed bug 2353. The relational optimizer didn't handle range join
+ expressions properly.
+- fixed bug 2354. Improved function resolution.
+
* Mon Aug 9 2010 Jennie Zhang y.zh...@cwi.nl
- Fixed bug 2645: mat.pack+algebra.slice should be replaced by mat.slice
for 'limit 1' (when the default_pipe is used)
diff -r 65a029afacb5 -r 45c1f030e31d sql/src/common/sql_types.mx
--- a/sql/src/common/sql_types.mx Thu Aug 12 12:44:23 2010 +0200
+++ b/sql/src/common/sql_types.mx Thu Aug 12 22:43:43 2010 +0200
@@ -768,12 +768,7 @@
if (list_length(f-ops) == nrargs is_subtype(tp,
((sql_arg *) f-ops-h-data)-type)) {
unsigned int scale = 0;
- sql_subfunc *fres;
-
- /* member functions should not match binary
operators */
- if (nrargs == 2 subtype_cmp( ((sql_arg *)
f-ops-h-data)-type, ((sql_arg *) f-ops-h-next-data)-type) == 0)
- continue;
- fres = ZNEW(sql_subfunc);
+ sql_subfunc *fres = ZNEW(sql_subfunc);
sql_ref_init((fres-ref));
fres-func = f;
diff -r 65a029afacb5 -r 45c1f030e31d sql/src/server/rel_exp.mx
--- a/sql/src/server/rel_exp.mx Thu Aug 12 12:44:23 2010 +0200
+++ b/sql/src/server/rel_exp.mx Thu Aug 12 22:43:43 2010 +0200
@@ -697,7 +697,10 @@
int
exp_is_join(sql_exp *e)
{
- if (e-type == e_cmp e-flag != cmp_or e-l e-r e-card =
CARD_AGGR)
+ /* only simple compare expressions, ie not or lists
+ or range expressions (e-f)
+*/
+ if (e-type == e_cmp e-flag != cmp_or e-l e-r !e-f
e-card = CARD_AGGR)
return 0;
return -1;
}
diff -r 65a029afacb5 -r 45c1f030e31d sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllThu Aug 12 12:44:23 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllThu Aug 12 22:43:43 2010 +0200
@@ -42,3 +42,8 @@
unicode-bom.Bug-2641
mat.slice_limit1.Bug-2645
shift_with_cast.Bug-2638
+concat_type_check_problem.Bug-2354
+crash_on_where_in.Bug-2333
+assert_on_type_mismatch.Bug-2319
+crash_on_in_1.Bug-2352
+crash_on_complex_join_exp.Bug-2353
diff -r 65a029afacb5 -r 45c1f030e31d
sql/src/test/BugTracker-2010/Tests/assert_on_type_mismatch.Bug-2319.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/assert_on_type_mismatch.Bug-2319.sql
Thu Aug 12 22:43:43 2010 +0200
@@ -0,0 +1,5 @@
+create table x (id1 varchar(1000), id2 int);
+create table dict (id int, x varchar(100));
+UPDATE dict SET id = (SELECT id2 FROM x WHERE id1=dict.id);
+drop table dict;
+drop table x;
diff -r 65a029afacb5 -r 45c1f030e31d
sql/src/test/BugTracker-2010/Tests/assert_on_type_mismatch.Bug-2319.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/assert_on_type_mismatch.Bug-2319.stable.err
Thu Aug 12 22:43:43 2010 +0200
@@ -0,0 +1,66 @@
+stderr of test 'assert_on_type_mismatch.Bug-2319` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 19:52:59
+# 19:52:59mserver5
--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf --debug=10
--set gdk_nr_threads=0 --set
monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin
--set gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
--set mapi_open=true --set xrpc_open=true --set mapi_port=32818 --set
xrpc_port=46410 --set monet_prompt= --set mal_listing=2 --trace
MonetDB: default - Merge with Jun2010 branch.
Changeset: 8670d9360669 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8670d9360669
Modified Files:
sql/ChangeLog.Jun2010
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 411 to 300 lines):
diff -r 668907374273 -r 8670d9360669 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Mon Aug 09 14:27:48 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Tue Aug 10 09:14:50 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Mon Aug 9 2010 Jennie Zhang y.zh...@cwi.nl
+- Fixed bug 2645: mat.pack+algebra.slice should be replaced by mat.slice
+ for 'limit 1' (when the default_pipe is used)
+
* Fri Aug 6 2010 Fabian Groffen fab...@cwi.nl
- Fixed bug #2641, The SQL server now handles Unicode BOM sequences
occurring in any place. Previously an unexpected character (U+FEFF)
diff -r 668907374273 -r 8670d9360669 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllMon Aug 09 14:27:48 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllTue Aug 10 09:14:50 2010 +0200
@@ -40,3 +40,4 @@
with_row_number_crash.Bug-2631
complex_query_crash.Bug-2633
unicode-bom.Bug-2641
+mat.slice_limit1.Bug-2645
diff -r 668907374273 -r 8670d9360669
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql Tue Aug
10 09:14:50 2010 +0200
@@ -0,0 +1,47 @@
+create table slice_test (x int, y int, val int);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+explain select x,y from slice_test limit 1;
+
+explain select cast(x as string)||'-bla-'||cast(y as string) from slice_test
limit 1;
+
+drop table slice_test;
+
diff -r 668907374273 -r 8670d9360669
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.err
Tue Aug 10 09:14:50 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'mat.slice_limit1.Bug-2645` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 15:04:12
+# 15:04:12mserver5
--config=/export/scratch0/zhang/monet-install/candidate/debug/etc/monetdb5.conf
--debug=10 --set gdk_nr_threads=0 --set
monet_mod_path=/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/lib:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/bin
--set
gdk_dbfarm=/export/scratch0/zhang/monet-install/candidate/debug/var/MonetDB5/dbfarm
--set mapi_open=true --set xrpc_open=true --set mapi_port=37776 --set
xrpc_port=42741 --set monet_prompt= --set mal_listing=2 --trace
--dbname=mTests_src_test_BugTracker-2010 --set mal_listing=0 ; echo ; echo
Over..
+# 15:04:12
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.4
+# builtin opt prefix = /export/scratch0/zhang/monet-install/candidate/debug
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# 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}/lib/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients
MonetDB: default - Merge with Jun2010 branch.
Changeset: 419c11d5bfa7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=419c11d5bfa7
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (50 lines):
diff -r 3b40c80c9172 -r 419c11d5bfa7 MonetDB5/src/modules/atoms/str.mx
--- a/MonetDB5/src/modules/atoms/str.mx Tue Jul 27 13:44:44 2010 +0200
+++ b/MonetDB5/src/modules/atoms/str.mx Wed Jul 28 09:53:58 2010 +0200
@@ -295,6 +295,7 @@
str_export int strConcat(str *res, str s, ptr val, int t);
str_export int strLength(int *res, str s);
+str_export int strSQLLength(int *res, str s);
str_export int strBytes(int *res, str s);
str_export int strTail(str *res, str s, int *offset);
str_export int strSubString(str *res, str s, int *offset, int *length);
@@ -2183,6 +2184,16 @@
*Res = res;
return GDK_SUCCEED;
}
+int
+strSQLLength(int *res, str s)
+{
+ str r = NULL;
+ strRtrim(r, s);
+ strLength(res, r);
+ GDKfree(r);
+ return GDK_SUCCEED;
+}
+
@
@- Wrappers
Here you find the wrappers around the version 4 library code
diff -r 3b40c80c9172 -r 419c11d5bfa7 MonetDB5/src/modules/kernel/batstr.mx
--- a/MonetDB5/src/modules/kernel/batstr.mx Tue Jul 27 13:44:44 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batstr.mx Wed Jul 28 09:53:58 2010 +0200
@@ -37,6 +37,10 @@
address STRbatLength
comment Return the length of a string.;
+command batstr.stringlength( s:bat[:oid,:str] ) :bat[:oid,:int]
+address STRbatstringLength
+comment Return the length of a right trimed string.;
+
command batstr.nbytes( s:bat[:oid,:str] ) :bat[:oid,:int]
address STRbatBytes
comment Return the string length in bytes.;
@@ -264,6 +268,7 @@
@c
@:BATint(Length,strLength,str)@
+@:BATint(stringLength,strSQLLength,str)@
@:BATint(Bytes,strBytes,str)@
@= BATstr
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 696a19ff66a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=696a19ff66a7
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_align.mx
MonetDB/src/gdk/gdk_bat.mx
MonetDB/src/gdk/gdk_batop.mx
MonetDB/src/gdk/gdk_relop.mx
MonetDB/src/gdk/gdk_setop.mx
MonetDB4/src/modules/contrib/oo7.mx
MonetDB5/src/optimizer/opt_reorder.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 323 to 300 lines):
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxWed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxWed Jul 28 13:21:44 2010 +0200
@@ -642,10 +642,13 @@
#define FATALcheck(tst,msg) if (tst) GDKfatal(msg);
#define ERRORcheck(tst,msg) if (tst) { GDKerror(msg); return 0; }
#define WARNcheck(tst, msg) if (tst) GDKwarning(msg)
-#define BATcheck(tst, msg)\
- if (tst == NULL) { \
- GDKerror(%s: BAT required.\n,msg);\
- return 0; \
+#define BATcheck(tst, msg)\
+ if (tst == NULL) { \
+ if (strchr(msg, ':')) \
+ GDKerror(%s.\n,msg); \
+ else\
+ GDKerror(%s: BAT required.\n,msg);\
+ return 0; \
}
/* needed for mel */
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_align.mx
--- a/MonetDB/src/gdk/gdk_align.mx Wed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_align.mx Wed Jul 28 13:21:44 2010 +0200
@@ -85,7 +85,7 @@
int
ALIGNcommit(BAT *b)
{
- BATcheck(b, ALIGNcommit: bat required);
+ BATcheck(b, ALIGNcommit);
if (!b-halign) {
b-halign = OIDnew(1);
}
@@ -98,7 +98,7 @@
int
ALIGNundo(BAT *b)
{
- BATcheck(b, ALIGNundo: bat required);
+ BATcheck(b, ALIGNundo);
return 0;
}
@@ -214,7 +214,7 @@
BAT *bn;
bat hp;
- BATcheck(h, VIEWhcreate: bat required);
+ BATcheck(h, VIEWhcreate);
recycled = bs = BBPrecycle(TYPE_void, TYPE_void, 1);
if (bs == NULL)
bs = BATcreatedesc(h-htype, TYPE_void, FALSE);
@@ -264,8 +264,8 @@
BAT *bn;
bat hp = 0, tp = 0, vc = 0;
- BATcheck(h, VIEWcreate_: bat required);
- BATcheck(t, VIEWcreate_: bat required);
+ BATcheck(h, VIEWcreate_);
+ BATcheck(t, VIEWcreate_);
recycled = bs = BBPrecycle(TYPE_void, TYPE_void, 1);
if (!bs)
bs = BATcreatedesc(h-htype, t-ttype, FALSE);
@@ -449,7 +449,7 @@
oid h, *x;
chr tshift;
- BATcheck(b, BATmaterialize: bat required);
+ BATcheck(b, BATmaterialize);
assert(!isVIEW(b));
ht = b-htype;
cnt = BATcapacity(b);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxWed Jul 28 10:18:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxWed Jul 28 13:21:44 2010 +0200
@@ -1149,7 +1149,7 @@
BAT *bm;
BATcheck(b, BUNins);
- BATcheck(h, BUNins: head value is nil\n);
+ BATcheck(h, BUNins: head value is nil);
countonly = (b-htype == TYPE_void b-ttype == TYPE_void);
bm = BBP_cache(-b-batCacheid);
@@ -1717,7 +1717,7 @@
BUN p;
BATcheck(b, BUNdel);
- BATcheck(x, BUNdel: head value is nil\n);
+ BATcheck(x, BUNdel: head value is nil);
if ((p = BUNlocate(b, x, y)) != BUN_NONE) {
ALIGNdel(b, BUNdel, force); /* zap alignment info */
@@ -1841,9 +1841,9 @@
{
BUN p;
- BATcheck(b, BUNreplace\n);
- BATcheck(h, BUNreplace: head value is nil\n);
- BATcheck(t, BUNreplace: tail value is nil\n);
+ BATcheck(b, BUNreplace);
+ BATcheck(h, BUNreplace: head value is nil);
+ BATcheck(t, BUNreplace: tail value is nil);
if ((p = BUNfnd(b, h)) == BUN_NONE)
return b;
@@ -1994,8 +1994,8 @@
BUN p, q;
BAT *v = NULL;
- BATcheck(b, BUNlocate: BAT parameter);
- BATcheck(x, BUNlocate: value parameter);
+ BATcheck(b, BUNlocate: BAT parameter required);
+ BATcheck(x, BUNlocate: value parameter required);
hcmp = BATatoms[b-htype].atomCmp;
tcmp = BATatoms[b-ttype].atomCmp;
p = BUNfirst(b);
@@ -3082,7 +3082,7 @@
bit isKey = FALSE;
BAT *parent;
- BATcheck(b, BATpropcheck: BAT parameter);
+ BATcheck(b, BATpropcheck);
if (b-halign == 0) {
b-batDirtydesc = 1;
b-halign = OIDnew(1);
diff -r a03cd9c551a1 -r 696a19ff66a7 MonetDB/src/gdk/gdk_batop.mx
---
MonetDB: default - Merge with Jun2010 branch.
Changeset: 038a15cf73c4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=038a15cf73c4 Modified Files: sql/src/benchmarks/uva/c1.sql sql/src/benchmarks/uva/c2.sql sql/src/benchmarks/uva/c3.sql sql/src/benchmarks/uva/cees.txt sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegmentIntFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegmentStringFeature_tab.txt sql/src/benchmarks/uva/cees/VxSegment_tab.txt sql/src/benchmarks/uva/cees/VxSegmentation_tab.txt sql/src/benchmarks/uva/cees/times sql/src/benchmarks/uva/count.sql sql/src/benchmarks/uva/drop.sql sql/src/benchmarks/uva/dump.sql sql/src/benchmarks/uva/j1.sql sql/src/benchmarks/uva/j2.sql sql/src/benchmarks/uva/j3.sql sql/src/benchmarks/uva/j4.sql sql/src/benchmarks/uva/journaal.txt sql/src/benchmarks/uva/journaal/VxSegmentDoubleFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentIntFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentStringFeature_tab.txt sql/src/benchmarks/uva/journaal/VxSegment_tab.txt sql/src/benchmarks/uva/journaal/VxSegmentation_tab.txt sql/src/benchmarks/uva/journaal/times sql/src/benchmarks/uva/load-cees.sql sql/src/benchmarks/uva/load-journaal.sql sql/src/benchmarks/uva/makeTables.sql sql/src/benchmarks/uva/run.all Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 145745 to 300 lines): diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c1.sql --- a/sql/src/benchmarks/uva/c1.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,10 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'team') AND - (feat0_0.value = 'Feyenoord'); - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c2.sql --- a/sql/src/benchmarks/uva/c2.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,14 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0, - VxSegmentStringFeature_tab feat0_1 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'team') AND - (feat0_0.value = 'Lazio Roma') AND - (feat0_1.segmentId = segment0.id) AND - (feat0_1.fieldName = 'type') AND - (feat0_1.value = 'Yellow'); - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/c3.sql --- a/sql/src/benchmarks/uva/c3.sql Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,9 +0,0 @@ -SELECT DISTINCT segment0.id -FROM VxSegment_tab segment0, - VxSegmentation_tab segmentation0, - VxSegmentStringFeature_tab feat0_0 -WHERE (segment0.segmentationId = segmentation0.id) AND - (segmentation0.name = 'demo') AND - (feat0_0.segmentId = segment0.id) AND - (feat0_0.fieldName = 'type') AND - (feat0_0.value = 'Goal'); diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/cees.txt --- a/sql/src/benchmarks/uva/cees.txt Wed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,28 +0,0 @@ -sqlplus cees/c...@csys - - -SQL @c1 - -ID --- - 20701 - 20703 - 20704 - - -SQL @c2 - -ID --- - 20711 - - -SQL @c3 - -ID --- - 20701 - 20702 - 20705 - 20709 - diff -r 8bb68df6d269 -r 038a15cf73c4 sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txt --- a/sql/src/benchmarks/uva/cees/VxSegmentDoubleFeature_tab.txtWed Jul 28 13:50:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,7610 +0,0 @@ - 1877,belief , .106383 - 1878,belief , .182927 - 1879,belief , .106383 - 1880,belief , .067 - 1881,belief , .0238095 - 1882,belief , .125 - 1883,belief , .272727 - 1884,belief , .486111 - 1885,belief , .0769231 - 1886,belief , .0952381 - 1887,belief , .67 - 1888,belief , .315789 - 1889,belief , .605263 - 1890,belief , .0952381 - 1891,belief , .263158 - 1892,belief , .0967742 - 1893,belief , .538462 - 1894,belief , .137931 - 1895,belief , .210526 - 1896,belief
MonetDB: default - Merge with Jun2010 branch.
Changeset: 91e56aa7bc6d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91e56aa7bc6d
Modified Files:
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/src/mapiclient/mclient.mx
sql/src/backends/monet5/merovingian/merovingian.c
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (231 lines):
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Thu Jul 22 09:48:43 2010 +0200
@@ -136,7 +136,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB4
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB4/dbfarm
# insert example db here!
# cleanup stuff we don't want to install
@@ -190,8 +190,9 @@
%{_libdir}/MonetDB4/lib/*.so*
%{_libdir}/MonetDB4/*.mil
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4
+%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB4/dbfarm
%config(noreplace) %{_sysconfdir}/MonetDB.conf
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/debian/monetdb4-server.dirs
--- a/MonetDB4/debian/monetdb4-server.dirs Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.dirs Thu Jul 22 09:48:43 2010 +0200
@@ -1,1 +1,2 @@
/var/MonetDB4
+/var/MonetDB4/dbfarm
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB4/debian/monetdb4-server.postinst
--- a/MonetDB4/debian/monetdb4-server.postinst Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.postinst Thu Jul 22 09:48:43 2010 +0200
@@ -10,9 +10,9 @@
if ! getent passwd monetdb /dev/null; then
adduser --system --ingroup monetdb --home /var/lib/monetdb
--disabled-password --shell /usr/sbin/nologin monetdb
fi
- mkdir -p /var/MonetDB4
- chown monetdb:monetdb /var/MonetDB4
- chmod ug=rwx,o= /var/MonetDB4
+ mkdir -p /var/MonetDB4/dbfarm
+ chown monetdb:monetdb /var/MonetDB4 /var/MonetDB4/dbfarm
+ chmod ug=rwx,g+s,o= /var/MonetDB4 /var/MonetDB4/dbfarm
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Thu Jul 22 09:48:43 2010 +0200
@@ -133,7 +133,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/MonetDB5/dbfarm
# insert example db here!
# cleanup stuff we don't want to install
@@ -183,8 +183,9 @@
%dir %{_libdir}/MonetDB5/lib
%dir %{_libdir}/MonetDB5/autoload
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
-%attr(770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+%attr(750,monetdb,monetdb) %dir %{_localstatedir}/MonetDB
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5
+%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/MonetDB5/dbfarm
%config(noreplace) %{_sysconfdir}/monetdb5.conf
%{_mandir}/man5/monetdb5.conf.5.gz
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/debian/monetdb5-server.dirs
--- a/MonetDB5/debian/monetdb5-server.dirs Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.dirs Thu Jul 22 09:48:43 2010 +0200
@@ -1,1 +1,2 @@
/var/MonetDB5
+/var/MonetDB5/dbfarm
diff -r 678d0587376a -r 91e56aa7bc6d MonetDB5/debian/monetdb5-server.postinst
--- a/MonetDB5/debian/monetdb5-server.postinst Wed Jul 21 20:38:53 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.postinst Thu Jul 22 09:48:43 2010 +0200
@@ -10,9 +10,9 @@
if ! getent passwd monetdb /dev/null; then
adduser --system --ingroup monetdb --home /var/lib/monetdb
--disabled-password --shell /usr/sbin/nologin monetdb
fi
- mkdir -p /var/MonetDB5
- chown monetdb:monetdb /var/MonetDB5
- chmod ug=rwx,o= /var/MonetDB5
+ mkdir -p /var/MonetDB5/dbfarm
+ chown monetdb:monetdb /var/MonetDB5 /var/MonetDB5/dbfarm
+ chmod ug=rwx,g+s,o= /var/MonetDB5 /var/MonetDB5/dbfarm
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -r 678d0587376a -r 91e56aa7bc6d clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Wed Jul 21 20:38:53 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Thu Jul 22 09:48:43 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Jul 21 2010 Fabian Groffen fab...@cwi.nl
+- Add --version option to mclient.
+
* Tue Jul 20 2010 Sjoerd Mullender sjo...@acm.org
- In case of an incomplete line from the server, add a newline.
This fixes bug 2619.
diff -r 678d0587376a -r 91e56aa7bc6d
MonetDB: default - Merge with Jun2010 branch.
Changeset: 106528b5e896 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=106528b5e896 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (27 lines): diff -r 91e56aa7bc6d -r 106528b5e896 MonetDB4/ChangeLog.Jun2010 --- a/MonetDB4/ChangeLog.Jun2010Thu Jul 22 09:48:43 2010 +0200 +++ b/MonetDB4/ChangeLog.Jun2010Thu Jul 22 09:59:48 2010 +0200 @@ -1,3 +1,8 @@ # ChangeLog file for MonetDB4 # This file is updated with Maddlog +* Thu Jul 22 2010 Sjoerd Mullender sjo...@acm.org +- Slight change to Fedora, Debian, Ubuntu installers: the database + directory now has the group setuid bit set so that new databases + inherit the group ownership (monetdb). + diff -r 91e56aa7bc6d -r 106528b5e896 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010Thu Jul 22 09:48:43 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010Thu Jul 22 09:59:48 2010 +0200 @@ -1,6 +1,11 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Thu Jul 22 2010 Sjoerd Mullender sjo...@acm.org +- Slight change to Fedora, Debian, Ubuntu installers: the database + directory now has the group setuid bit set so that new databases + inherit the group ownership (monetdb). + * Thu Jul 15 2010 Stefan Manegold stefan.maneg...@cwi.nl - restored genuine original mitosis logic by disabling incorrect octopus dominance (even when octopus was not ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 5e0449357195 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e0449357195
Modified Files:
buildtools/conf/MonetDB.m4
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (154 lines):
diff -r 6c53ea638a80 -r 5e0449357195 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4Thu Jul 22 14:04:34 2010 +0200
+++ b/buildtools/conf/MonetDB.m4Thu Jul 22 15:42:33 2010 +0200
@@ -1240,7 +1240,7 @@
AC_C_CHAR_UNSIGNED
# Checks for library functions.
-AC_CHECK_FUNCS([ftruncate gettimeofday opendir sysconf times])
+AC_CHECK_FUNCS([ftruncate getaddrinfo gettimeofday opendir sysconf times])
AC_CHECK_FUNCS([madvise posix_fadvise posix_madvise]) dnl gdk_posix.mx
AC_FUNC_FSEEKO()
diff -r 6c53ea638a80 -r 5e0449357195 buildtools/conf/winconfig.h
--- a/buildtools/conf/winconfig.h Thu Jul 22 14:04:34 2010 +0200
+++ b/buildtools/conf/winconfig.h Thu Jul 22 15:42:33 2010 +0200
@@ -54,6 +54,7 @@
#include process.h
#include windows.h
#include stddef.h
+#include ws2tcpip.h
/* Release name or unreleased */
#define MONETDB_RELEASE unreleased
@@ -163,6 +164,9 @@
/* Does your compiler support function attributes (__attribute__)? */
/* #undef HAVE_FUNCTION_ATTRIBUTES */
+/* Define to 1 if you have the `getaddrinfo' function. */
+#define HAVE_GETADDRINFO 1
+
/* Define to 1 if you have the `getlogin' function. */
/* #undef HAVE_GETLOGIN */
diff -r 6c53ea638a80 -r 5e0449357195 buildtools/conf/winrules.msc
--- a/buildtools/conf/winrules.msc Thu Jul 22 14:04:34 2010 +0200
+++ b/buildtools/conf/winrules.msc Thu Jul 22 15:42:33 2010 +0200
@@ -222,7 +222,7 @@
LIBC_INCS = $(PTHREAD_INCS)
MATH_LIBS =
-SOCKET_LIBS = wsock32.lib
+SOCKET_LIBS = wsock32.lib Ws2_32.lib
MEL=mel.exe
MX=Mx.exe
diff -r 6c53ea638a80 -r 5e0449357195 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Thu Jul 22 14:04:34 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Thu Jul 22 15:42:33 2010 +0200
@@ -2329,13 +2329,6 @@
static MapiMsg
connect_to_server(Mapi mid)
{
- struct sockaddr_in server;
-
-#ifdef HAVE_SYS_UN_H
- struct sockaddr_un userver;
-#endif
- struct sockaddr *serv;
- socklen_t servsize;
SOCKET s;
char errbuf[8096];
@@ -2355,6 +2348,8 @@
struct msghdr msg;
struct iovec vec;
char buf[1];
+ struct sockaddr_un userver;
+ struct sockaddr *serv = (struct sockaddr *) userver;
if (strlen(mid-hostname) = sizeof(userver.sun_path)) {
return mapi_setError(mid, path name too long,
mapi_reconnect, MERROR);
@@ -2368,11 +2363,9 @@
memset(userver, 0, sizeof(struct sockaddr_un));
userver.sun_family = AF_UNIX;
strncpy(userver.sun_path, mid-hostname,
sizeof(userver.sun_path));
- serv = (struct sockaddr *) userver;
- servsize = sizeof(struct sockaddr_un);
s = socket(PF_UNIX, SOCK_STREAM, 0);
- if (connect(s, serv, servsize) 0) {
+ if (connect(s, serv, sizeof(struct sockaddr_un)) 0) {
snprintf(errbuf, sizeof(errbuf),
initiating connection on socket failed: %s,
strerror(errno));
@@ -2399,7 +2392,39 @@
} else
#endif
{
+#ifdef HAVE_GETADDRINFO
+ struct addrinfo hints, *res, *rp;
+ char port[32];
+ int ret;
+
+ if (mid-hostname == NULL)
+ mid-hostname = strdup(localhost);
+ snprintf(port, sizeof(port), %d, mid-port 0x);
+
+ memset(hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = IPPROTO_TCP;
+ ret = getaddrinfo(mid-hostname, port, hints, res);
+ if (ret) {
+ snprintf(errbuf, sizeof(errbuf), getaddrinfo failed:
%s, gai_strerror(ret));
+ return mapi_setError(mid, errbuf, mapi_reconnect,
MERROR);
+ }
+ for (rp = res; rp; rp = rp-ai_next) {
+ s = socket(rp-ai_family, rp-ai_socktype,
rp-ai_protocol);
+ if (s == INVALID_SOCKET)
+ continue;
+ if (connect(s, rp-ai_addr, rp-ai_addrlen) != -1)
+ break; /* success */
+ close(s);
+ }
+ freeaddrinfo(res);
+ if (rp == NULL)
+ return mapi_setError(mid, could not connect,
mapi_reconnect, MERROR);
+#else
+ struct sockaddr_in server;
struct hostent *hp;
+ struct sockaddr *serv = (struct sockaddr *) server;
if (mid-hostname == NULL)
MonetDB: default - Merge with Jun2010 branch.
Changeset: 5c61b9a88aed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c61b9a88aed Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (21 lines): diff -r 5e0449357195 -r 5c61b9a88aed sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err --- a/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err Thu Jul 22 15:42:33 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err Thu Jul 22 16:28:40 2010 +0200 @@ -71,13 +71,13 @@ # 13:12:55 mclient -lsql -ftest -i -e --host=rig --port=39884 # 13:12:55 -MAPI = mone...@alviss:32394 +MAPI = mone...@alviss:31044 QUERY = connect to default; ERROR = !CONNECT TO: DEFAULT is not supported! -MAPI = mone...@alviss:32394 +MAPI = mone...@alviss:31044 QUERY = connect to 'whatever' port 50001 database 'nonexisting' USER 'monetdb' PASSWORD 'monetdb' LANGUAGE 'mal'; -ERROR = !IOException:mapi.connect:Could not connect: gethostbyname failed: Unknown host -MAPI = mone...@alviss:32394 +ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo failed: Name or service not known +MAPI = mone...@alviss:31044 QUERY = disconnect 'whatever'; ERROR = !DISCONNECT CATALOG: no such db_alias 'whatever' ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: a76947a0304a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a76947a0304a
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (86 lines):
diff -r be31eb57b206 -r a76947a0304a
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
Tue Jul 20 14:48:59 2010 +0200
@@ -0,0 +1,82 @@
+stderr of test 'error-truncated.Bug-2615` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 17:25:18
+# 17:25:18mserver5
--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf --debug=10 --set
gdk_nr_threads=0 --set
monet_mod_path=/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin
--set gdk_dbfarm=/ufs/sjoerd/Monet-virgin-stable/var/MonetDB5/dbfarm --set
mapi_open=true --set xrpc_open=true --set mapi_port=38866 --set xrpc_port=43109
--set monet_prompt= --set mal_listing=2 --trace
--dbname=mTests_src_test_BugTracker-2010 --set mal_listing=0 ; echo ; echo
Over..
+# 17:25:18
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.3
+# builtin opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt =
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
MonetDB: default - Merge with Jun2010 branch.
Changeset: d4eb822dfa01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4eb822dfa01
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (141 lines):
diff -r 8563aa91e7a3 -r d4eb822dfa01 clients/src/odbc/driver/ODBCStmt.h
--- a/clients/src/odbc/driver/ODBCStmt.hMon Jul 19 16:41:53 2010 +0200
+++ b/clients/src/odbc/driver/ODBCStmt.hMon Jul 19 16:42:26 2010 +0200
@@ -80,9 +80,9 @@
set (0 based); rowSetSize is the number of rows in the
current result set; currentRow is the row number of the
current row within the current result set */
- SQLROWOFFSET currentRow;
- SQLROWOFFSET startRow;
- SQLROWOFFSET rowSetSize;
+ SQLLEN currentRow;
+ SQLLEN startRow;
+ SQLLEN rowSetSize;
unsigned int currentCol; /* used by SQLGetData() */
SQLINTEGER retrieved; /* amount of data retrieved */
diff -r 8563aa91e7a3 -r d4eb822dfa01 clients/src/odbc/driver/SQLExtendedFetch.c
--- a/clients/src/odbc/driver/SQLExtendedFetch.cMon Jul 19 16:41:53
2010 +0200
+++ b/clients/src/odbc/driver/SQLExtendedFetch.cMon Jul 19 16:42:26
2010 +0200
@@ -42,8 +42,12 @@
SQLRETURN SQL_API
SQLExtendedFetch(SQLHSTMT hStmt,
SQLUSMALLINT nOrientation,
-SQLROWOFFSET nOffset,
-SQLROWSETSIZE *pnRowCount,
+SQLLEN nOffset,
+#ifdef BUILD_REAL_64_BIT_MODE /* note: only defined on Debian Lenny */
+SQLUINTEGER *pnRowCount,
+#else
+SQLULEN *pnRowCount,
+#endif
SQLUSMALLINT *pRowStatusArray)
{
ODBCStmt *stmt = (ODBCStmt *) hStmt;
@@ -81,8 +85,13 @@
if (SQL_SUCCEEDED(rc) || rc == SQL_NO_DATA)
stmt-State = EXTENDEDFETCHED;
- if (SQL_SUCCEEDED(rc) pnRowCount)
+ if (SQL_SUCCEEDED(rc) pnRowCount) {
+#ifdef BUILD_REAL_64_BIT_MODE /* note: only defined on Debian Lenny */
+ *pnRowCount = (SQLUINTEGER) stmt-rowSetSize;
+#else
*pnRowCount = (SQLULEN) stmt-rowSetSize;
+#endif
+ }
return rc;
}
diff -r 8563aa91e7a3 -r d4eb822dfa01 clients/src/odbc/driver/SQLFetch.c
--- a/clients/src/odbc/driver/SQLFetch.cMon Jul 19 16:41:53 2010 +0200
+++ b/clients/src/odbc/driver/SQLFetch.cMon Jul 19 16:42:26 2010 +0200
@@ -77,7 +77,7 @@
updating the SQL_DESC_ARRAY_STATUS_PTR */
stmt-rowSetSize = desc-sql_desc_array_size;
- if (stmt-startRow + stmt-rowSetSize (SQLROWOFFSET)
stmt-rowcount)
+ if (stmt-startRow + stmt-rowSetSize (SQLLEN) stmt-rowcount)
stmt-rowSetSize = stmt-rowcount - stmt-startRow;
if (stmt-rowSetSize = 0) {
@@ -85,7 +85,7 @@
return SQL_NO_DATA;
}
if (statusp) {
- for (row = 0; (SQLROWOFFSET) row stmt-rowSetSize;
row++)
+ for (row = 0; (SQLLEN) row stmt-rowSetSize; row++)
*statusp++ = SQL_ROW_SUCCESS;
for (; row desc-sql_desc_array_size; row++)
*statusp++ = SQL_ROW_NOROW;
diff -r 8563aa91e7a3 -r d4eb822dfa01 clients/src/odbc/driver/SQLFetchScroll.c
--- a/clients/src/odbc/driver/SQLFetchScroll.c Mon Jul 19 16:41:53 2010 +0200
+++ b/clients/src/odbc/driver/SQLFetchScroll.c Mon Jul 19 16:42:26 2010 +0200
@@ -45,7 +45,7 @@
SQLRETURN
SQLFetchScroll_(ODBCStmt *stmt,
SQLSMALLINT FetchOrientation,
- SQLROWOFFSET FetchOffset)
+ SQLLEN FetchOffset)
{
assert(stmt-hdl);
@@ -62,7 +62,7 @@
switch (FetchOrientation) {
case SQL_FETCH_NEXT:
- if (stmt-currentRow = (SQLROWOFFSET) stmt-rowcount) {
+ if (stmt-currentRow = (SQLLEN) stmt-rowcount) {
stmt-State = FETCHED;
return SQL_NO_DATA;
}
@@ -84,7 +84,7 @@
stmt-State = FETCHED;
return SQL_NO_DATA;
}
- if (stmt-startRow (SQLROWOFFSET) RowSetSize) {
+ if (stmt-startRow (SQLLEN) RowSetSize) {
/* Attempt to fetch before the result set
returned the first rowset */
addStmtError(stmt, 01S06, NULL, 0);
@@ -94,7 +94,7 @@
break;
case SQL_FETCH_RELATIVE:
if ((stmt-currentRow != 0 || FetchOffset = 0)
- (stmt-currentRow != (SQLROWOFFSET) stmt-rowcount ||
FetchOffset = 0)) {
+ (stmt-currentRow != (SQLLEN) stmt-rowcount || FetchOffset
= 0)) {
if ((stmt-currentRow == 0 FetchOffset = 0) ||
(stmt-startRow == 0 FetchOffset 0) ||
(stmt-startRow 0
@@ -114,8 +114,8 @@
MonetDB: default - Merge with Jun2010 branch.
Changeset: 02250651bd9b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02250651bd9b Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (16 lines): diff -r fe5e7e1880c3 -r 02250651bd9b buildtools/conf/winrules.msc --- a/buildtools/conf/winrules.msc Fri Jul 16 15:21:03 2010 +0200 +++ b/buildtools/conf/winrules.msc Fri Jul 16 15:27:32 2010 +0200 @@ -91,8 +91,11 @@ LIBPERL = C:\Perl64 !ENDIF !ENDIF +!IFNDEF PERLLIB +PERLLIB = perl510.lib +!ENDIF PERL_INCS = -I$(LIBPERL)\lib\CORE -DWIN32 -PERL_LIBS = $(LIBPERL)\lib\CORE\perl510.lib +PERL_LIBS = $(LIBPERL)\lib\CORE\$(PERLLIB) PERL_LIBDIR = share\MonetDB\perl !ENDIF ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: c277794da3d5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c277794da3d5 Modified Files: MonetDB/MonetDB.spec MonetDB4/MonetDB-server.spec MonetDB5/MonetDB-server.spec clients/MonetDB-client.spec geom/MonetDB-geom.spec pathfinder/MonetDB-XQuery.spec sql/MonetDB-SQL.spec testing/MonetDB-testing.spec Branch: default Log Message: Merge with Jun2010 branch. diffs (truncated from 990 to 300 lines): diff -r 3466c419e414 -r c277794da3d5 MonetDB/MonetDB.spec --- a/MonetDB/MonetDB.spec Thu Jul 15 10:43:05 2010 +0200 +++ b/MonetDB/MonetDB.spec Thu Jul 15 13:55:03 2010 +0200 @@ -132,20 +132,20 @@ * Tue Apr 20 2010 Stefan Manegold maneg...@cwi.nl - 1.38.1-20100618 - Made compilation of testing (and java) independent of MonetDB. - This is mainly for Windows, but also on other systems, testing can now be - built independently of (and hence before) MonetDB. - Files that mimic configure functionality on Windows were moved from - MonetDB to buildtools; hence, this affects all packages on Windows, - requiring a complete rebuild from scratch on Windows. - getopt() support in testing has changed; hence, (most probably) requiring a - rebuild from scratch of testing on other systems. + This is mainly for Windows, but also on other systems, testing can + now be built independently of (and hence before) MonetDB. Files + that mimic configure functionality on Windows were moved from + MonetDB to buildtools; hence, this affects all packages on + Windows, requiring a complete rebuild from scratch on Windows. + getopt() support in testing has changed; hence, (most probably) + requiring a rebuild from scratch of testing on other systems. * Tue Apr 20 2010 Stefan Manegold maneg...@cwi.nl - 1.38.1-20100618 -- Implemented build directory support for Windows, - i.e., like on Unix/Linux also on Windows we can now build in a separate - build directory as alternative to ...packageNT, and thus keep the - latter clean from files generated during the build. - On Windows, the build directory must be a sibling of ...packageNT . +- Implemented build directory support for Windows, i.e., like on + Unix/Linux also on Windows we can now build in a separate build + directory as alternative to ...packageNT, and thus keep the latter + clean from files generated during the build. On Windows, the build + directory must be a sibling of ...packageNT . * Tue Apr 20 2010 Sjoerd Mullender sjo...@acm.org - 1.36.5-20100420 - Rebuilt. @@ -160,7 +160,8 @@ deleted when the server restarts). * Mon Mar 29 2010 Fabian Groffen fab...@cwi.nl - 1.36.5-20100420 -- Fix regression introduced in Feb2010-SP1 causing UDP connections to malfunction, in particular affecting the stethoscope tool. +- Fix regression introduced in Feb2010-SP1 causing UDP connections to + malfunction, in particular affecting the stethoscope tool. * Mon Mar 22 2010 Sjoerd Mullender sjo...@acm.org - 1.36.3-20100322 - Rebuilt. @@ -168,41 +169,41 @@ * Mon Mar 01 2010 Fabian Groffen fab...@cwi.nl - 1.36.3-20100322 - Fixed bug in UDP stream creation causing UDP connections to already bound ports to be reported as successful. + * Wed Feb 24 2010 Sjoerd Mullender sjo...@acm.org - 1.36.1-20100224 - Rebuilt. * Mon Feb 22 2010 Sjoerd Mullender sjo...@acm.org - 1.36.1-20100223 - Various concurrency bugs were fixed. -- Various changes were made to run better on systems that don't have enough - memory to keep everything in core that was touched during query processing. - This is done by having the higher layers giving hints to the database - kernel about future use, and the database kernel giving hings to the - operating system kernel about how (virtual) memory is going to be used. +- Various changes were made to run better on systems that don't have + enough memory to keep everything in core that was touched during + query processing. This is done by having the higher layers giving + hints to the database kernel about future use, and the database + kernel giving hings to the operating system kernel about how + (virtual) memory is going to be used. * Thu Feb 18 2010 Stefan Manegold stefan.maneg...@cwi.nl - 1.36.1-20100223 -- Fixed bug in mergejoin implementation. - This fixes bug #2952191. +- Fixed bug in mergejoin implementation. This fixes bug #2952191. * Tue Feb 2 2010 Sjoerd Mullender sjo...@acm.org - 1.36.1-20100223 - Added support for compiling on Windows using the Cygwin-provided version of flex. * Thu Jan 21 2010 Sjoerd Mullender sjo...@acm.org - 1.36.1-20100223 -- Fix compilation issue when configured with --with-curl. - This fixes bug #2924999. +- Fix compilation issue when configured with --with-curl. This fixes + bug #2924999. * Thu Jan 21 2010 Fabian Groffen fab...@cwi.nl - 1.36.1-20100223 - Added implementation of MT_getrss() for Solaris. This yields in the kernel knowing about its (approximate)
MonetDB: default - Merge with Jun2010 branch.
Changeset: 86e2a43ce3de for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86e2a43ce3de
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
Fix for bug 2615: truncate value in error message so that line and column can
be seen.
diffs (29 lines):
diff -r 1d972a3c6dae -r 86e2a43ce3de MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mxThu Jul 15 15:25:27 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mxThu Jul 15 17:11:52 2010 +0200
@@ -166,8 +166,12 @@
char *val;
val = *s ? GDKstrdup(s) : GDKstrdup();
if ( *err == NULL){
- snprintf(buf,BUFSIZ, value '%s' from line BUNFMT
-field %d not inserted, expecting type %s\n,
val, BATcount(fmt-c[0])+1, col, fmt-type);
+ snprintf(buf, BUFSIZ, value '%.*s%s' from line
BUNFMT
+ field %d not inserted, expecting
type %s\n,
+BUFSIZ - 200, val,
+strlen(val) (size_t) BUFSIZ - 200 ?
... : ,
+BATcount(fmt-c[0])+1,
+col, fmt-type);
*err= GDKstrdup(buf);
}
GDKfree(val);
@@ -185,7 +189,9 @@
return ret;
bunins_failed:
if (*err == NULL) {
- snprintf(buf,BUFSIZ, parsing error from line BUNFMT field
%d not inserted\n, BATcount(fmt-c[0])+1, col);
+ snprintf(buf, BUFSIZ, parsing error from line BUNFMT
+ field %d not inserted\n,
+BATcount(fmt-c[0])+1, col);
*err= GDKstrdup(buf);
}
return -1;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: fa9942e113cb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa9942e113cb
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
Approved test for bug 2615.
This is probably the best we can do in the current table reading infrastructure.
diffs (121 lines):
diff -r 86e2a43ce3de -r fa9942e113cb
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
Thu Jul 15 17:28:06 2010 +0200
@@ -0,0 +1,82 @@
+stderr of test 'error-truncated.Bug-2615` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 17:25:18
+# 17:25:18mserver5
--config=/ufs/sjoerd/Monet-virgin-stable/etc/monetdb5.conf --debug=10 --set
gdk_nr_threads=0 --set
monet_mod_path=/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-virgin-stable/lib64/MonetDB5/bin
--set gdk_dbfarm=/ufs/sjoerd/Monet-virgin-stable/var/MonetDB5/dbfarm --set
mapi_open=true --set xrpc_open=true --set mapi_port=38866 --set xrpc_port=43109
--set monet_prompt= --set mal_listing=2 --trace
--dbname=mTests_src_test_BugTracker-2010 --set mal_listing=0 ; echo ; echo
Over..
+# 17:25:18
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.3
+# builtin opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt =
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-virgin-stable
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
MonetDB: default - Merge with Jun2010 branch.
Changeset: ad27ec744389 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad27ec744389 Modified Files: sql/src/test/BugTracker-2010/Tests/All Branch: default Log Message: Merge with Jun2010 branch. diffs (9 lines): diff -r fa9942e113cb -r ad27ec744389 sql/src/test/BugTracker-2010/Tests/All --- a/sql/src/test/BugTracker-2010/Tests/AllThu Jul 15 17:28:06 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/AllThu Jul 15 17:31:56 2010 +0200 @@ -33,4 +33,4 @@ ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606 second_function_existing_signature.Bug-2611 update_statement_in_function_ignored.Bug-2614 -#error-truncated.Bug-2615 +error-truncated.Bug-2615 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: bdcb528a500b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bdcb528a500b Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (48 lines): diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/list.milS --- a/MonetDB4/tests/from_Twente/moa/Tests/list.milSWed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/list.milSWed Jul 14 10:52:24 2010 +0200 @@ -954,7 +954,7 @@ _MMjoin_10 := join(indexA,_MMmirror_9); _MMreverse_11 := reverse(_MMmirror_9); _MMreverse_12 := reverse(valuesC); -_MMjoin_13 := join(valuesA,_MMreverse_12); +_MMjoin_13 := join(valuesA,_MMreverse_12).sort_ht(); _MMcastnil_14 := _MMjoin_13.mark(0...@0); _MMjoin_15 := join(_MMreverse_11,_MMcastnil_14); var _MMcastnil_16 := _MMjoin_15.mark(0...@0); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/list.stable.out --- a/MonetDB4/tests/from_Twente/moa/Tests/list.stable.out Wed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/list.stable.out Wed Jul 14 10:52:24 2010 +0200 @@ -2182,7 +2182,7 @@ _MMjoin_10 := join(indexA,_MMmirror_9); _MMreverse_11 := reverse(_MMmirror_9); _MMreverse_12 := reverse(valuesC); -_MMjoin_13 := join(valuesA,_MMreverse_12); +_MMjoin_13 := join(valuesA,_MMreverse_12).sort_ht(); _MMcastnil_14 := _MMjoin_13.mark(0...@0); _MMjoin_15 := join(_MMreverse_11,_MMcastnil_14); var _MMcastnil_16 := _MMjoin_15.mark(0...@0); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/test.milS --- a/MonetDB4/tests/from_Twente/moa/Tests/test.milSWed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/test.milSWed Jul 14 10:52:24 2010 +0200 @@ -968,7 +968,7 @@ var _MMreverse_11 := reverse(_MMjoin_10); var _MMnilcast_12 := _MMreverse_11.reverse().mark(0...@0).reverse(); var _MMjoin_13 := join(_MMnilcast_9,valuesD); -var _MMnilcast_14 := _MMjoin_7.reverse().mark(0...@0).reverse(); +var _MMnilcast_14 := _MMjoin_7s.reverse().mark(0...@0).reverse(); _MMnilcast_14.sort_ht().print(); var _MMjoin_15 := join(_MMnilcast_14,indexB); _MMjoin_15.sort_ht().print(); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/test.stable.out --- a/MonetDB4/tests/from_Twente/moa/Tests/test.stable.out Wed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/test.stable.out Wed Jul 14 10:52:24 2010 +0200 @@ -2354,7 +2354,7 @@ var _MMreverse_11 := reverse(_MMjoin_10); var _MMnilcast_12 := _MMreverse_11.reverse().mark(0...@0).reverse(); var _MMjoin_13 := join(_MMnilcast_9,valuesD); -var _MMnilcast_14 := _MMjoin_7.reverse().mark(0...@0).reverse(); +var _MMnilcast_14 := _MMjoin_7s.reverse().mark(0...@0).reverse(); _MMnilcast_14.sort_ht().print(); #-# # BAT: tmp_56 # ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 091e939109be for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=091e939109be Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (42 lines): diff -r f5213232e57d -r 091e939109be sql/src/benchmarks/ATIS/Tests/select_simple_join.sql --- a/sql/src/benchmarks/ATIS/Tests/select_simple_join.sql Wed Jul 14 11:01:30 2010 +0200 +++ b/sql/src/benchmarks/ATIS/Tests/select_simple_join.sql Wed Jul 14 11:08:54 2010 +0200 @@ -1,5 +1,5 @@ select city.city_name,state.state_name,city.city_code from city,state where city.city_code='MATL' and city.state_code=state.state_code; -select city.city_name,state.state_name,city.city_code from state,city where city.state_code=state.state_code; -select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code; -select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code and day_name.day_code = 4; +select city.city_name,state.state_name,city.city_code from state,city where city.state_code=state.state_code order by city.city_name,state.state_name; +select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code order by month_name.month_number; +select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code and day_name.day_code = 4 order by month_name.month_number; select flight.flight_code,aircraft.aircraft_type from flight,aircraft where flight.aircraft_code=aircraft.aircraft_code order by flight.flight_code; diff -r f5213232e57d -r 091e939109be sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out --- a/sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out Wed Jul 14 11:01:30 2010 +0200 +++ b/sql/src/benchmarks/ATIS/Tests/select_simple_join.stable.out Wed Jul 14 11:08:54 2010 +0200 @@ -32,17 +32,18 @@ % city_name, state_name, city_code # name % char,char, char # type % 25, 25, 4 # length +[ ATLANTA, GEORGIA, MATL ] +[ BALTIMORE, MARYLAND, BBWI ] +[ BOSTON,MASSACHUSETTS,BBOS ] +[ DALLAS,TEXAS,DDFW ] +[ DENVER,COLORADO, DDEN ] +[ FORT WORTH,TEXAS,FDFW ] [ OAKLAND, CALIFORNIA, OOAK ] +[ PHILADELPHIA, PENNSYLVANIA, PPHL ] +[ PITTSBURGH,PENNSYLVANIA, PPIT ] [ SAN FRANCISCO, CALIFORNIA, SSFO ] -[ DENVER,COLORADO, DDEN ] [ WASHINGTON,DISTRICT OF COLUMBIA, WWAS ] -[ ATLANTA, GEORGIA, MATL ] -[ BOSTON,MASSACHUSETTS,BBOS ] -[ BALTIMORE, MARYLAND, BBWI ] -[ PITTSBURGH,PENNSYLVANIA, PPIT ] -[ PHILADELPHIA, PENNSYLVANIA, PPHL ] -[ FORT WORTH,TEXAS,FDFW ] -[ DALLAS,TEXAS,DDFW ] +#select month_name.month_name,day_name.day_name from month_name,day_name where month_name.month_number=day_name.day_code; % sys.month_name, sys.day_name # table_name % month_name, day_name # name % char,char # type ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch: s/mo...@cwi.nl/inf...
Changeset: 713e92afed0d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=713e92afed0d Modified Files: MonetDB/configure.ag MonetDB4/configure.ag MonetDB5/configure.ag buildtools/configure.ac clients/configure.ag geom/configure.ag java/configure.ag pathfinder/configure.ag python/setup.py sql/configure.ag template/configure.ag testing/configure.ag Branch: default Log Message: Merge with Jun2010 branch: s/mo...@cwi.nl/i...@monetdb.org/ diffs (truncated from 421 to 300 lines): diff -r be790c3f0fc1 -r 713e92afed0d MonetDB/HowToStart.rst --- a/MonetDB/HowToStart.rstWed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB/HowToStart.rstWed Jul 14 15:07:45 2010 +0200 @@ -557,7 +557,7 @@ Bugs and other problems with compiling or running MonetDB should be reported using our `bug tracking system`__ (preferred) or -emailed to mo...@cwi.nl. Please make sure that you give a *detailed* +emailed to i...@monetdb.org. Please make sure that you give a *detailed* description of your problem! __ http://bugs.monetdb.org/ diff -r be790c3f0fc1 -r 713e92afed0d MonetDB/NT/website.html --- a/MonetDB/NT/website.html Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB/NT/website.html Wed Jul 14 15:07:45 2010 +0200 @@ -30,7 +30,7 @@ hr -addressa href=mailto:mo...@cwi.nl;The MonetDB Team/a/address +addressa href=mailto:i...@monetdb.org;The MonetDB Team/a/address !-- Created: Thu Jun 22 11:30:10 WEDT 2006 -- !-- hhmts start -- Last modified: Thu Jun 22 11:31:27 WEDT 2006 diff -r be790c3f0fc1 -r 713e92afed0d MonetDB/configure.ag --- a/MonetDB/configure.ag Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB/configure.ag Wed Jul 14 15:07:45 2010 +0200 @@ -20,7 +20,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([MonetDB Common], [1.39.0], [mo...@cwi.nl], [MonetDB]) +AC_INIT([MonetDB Common], [1.39.0], [i...@monetdb.org], [MonetDB]) # ^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff -r be790c3f0fc1 -r 713e92afed0d MonetDB/debian/control --- a/MonetDB/debian/controlWed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB/debian/controlWed Jul 14 15:07:45 2010 +0200 @@ -1,7 +1,7 @@ Source: monetdb Section: misc Priority: extra -Maintainer: MonetDB BV mo...@cwi.nl +Maintainer: MonetDB BV i...@monetdb.org Build-Depends: debhelper (= 5), autotools-dev, zlib1g-dev, libbz2-dev, libssl-dev, cdbs Standards-Version: 3.8.0 diff -r be790c3f0fc1 -r 713e92afed0d MonetDB4/configure.ag --- a/MonetDB4/configure.ag Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB4/configure.ag Wed Jul 14 15:07:45 2010 +0200 @@ -19,7 +19,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([MonetDB Server], [4.39.0], [mo...@cwi.nl], [MonetDB4-server]) +AC_INIT([MonetDB Server], [4.39.0], [i...@monetdb.org], [MonetDB4-server]) # ^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff -r be790c3f0fc1 -r 713e92afed0d MonetDB4/debian/control --- a/MonetDB4/debian/control Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB4/debian/control Wed Jul 14 15:07:45 2010 +0200 @@ -1,7 +1,7 @@ Source: monetdb4-server Section: misc Priority: extra -Maintainer: MonetDB BV mo...@cwi.nl +Maintainer: MonetDB BV i...@monetdb.org Build-Depends: debhelper (= 5), cdbs, autotools-dev, libpcre3-dev, libmonetdb-dev, libmonetdb-client-dev Standards-Version: 3.8.0 diff -r be790c3f0fc1 -r 713e92afed0d MonetDB4/website.html --- a/MonetDB4/website.html Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB4/website.html Wed Jul 14 15:07:45 2010 +0200 @@ -30,7 +30,7 @@ hr -addressa href=mailto:mo...@cwi.nl;The MonetDB Team/a/address +addressa href=mailto:i...@monetdb.org;The MonetDB Team/a/address !-- Created: Thu Jun 22 11:30:10 WEDT 2006 -- !-- hhmts start -- Last modified: Thu Jun 22 11:31:27 WEDT 2006 diff -r be790c3f0fc1 -r 713e92afed0d MonetDB5/configure.ag --- a/MonetDB5/configure.ag Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB5/configure.ag Wed Jul 14 15:07:45 2010 +0200 @@ -20,7 +20,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT([MonetDB Server], [5.21.0], [mo...@cwi.nl], [MonetDB5-server]) +AC_INIT([MonetDB Server], [5.21.0], [i...@monetdb.org], [MonetDB5-server]) # ^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff -r be790c3f0fc1 -r 713e92afed0d MonetDB5/debian/control --- a/MonetDB5/debian/control Wed Jul 14 14:43:36 2010 +0200 +++ b/MonetDB5/debian/control Wed Jul 14 15:07:45 2010 +0200 @@
MonetDB: default - Merge with Jun2010 branch.
Changeset: 084dad091d4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=084dad091d4a
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (92 lines):
diff -r 5d2c2a67f899 -r 084dad091d4a clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Tue Jul 13 10:26:21 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Tue Jul 13 10:54:12 2010 +0200
@@ -1848,12 +1848,11 @@
if ((hdl = mapi_query(mid,
SELECT
\t\.\name\, \t\.\type\,
\s\.\name\
- FROM
\sys\.\tables\ \t\,
+ FROM
\sys\.\_tables\ \t\,
\sys\.\schemas\ \s\
WHERE
\t\.\schema_id\ = \s\.\id\
AND
\s\.\name\ = \current_schema\
AND
\t\.\system\ = false
- AND
\t\.\temporary\ = 0
ORDER BY
\t\.\name\)) != NULL
mapi_error(mid) == MOK) {
char *type, *name,
*schema;
diff -r 5d2c2a67f899 -r 084dad091d4a clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Jul 13 10:26:21 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Jul 13 10:54:12 2010 +0200
@@ -1054,6 +1054,7 @@
char *errorstr; /* error from server */
struct MapiColumn *fields;
struct MapiRowBuf cache;
+ int commentonly;/* only comments seen so far */
};
@h
@@ -1663,6 +1664,8 @@
result-cache.tuplecount = 0;
result-cache.line = NULL;
+ result-commentonly = 1;
+
return result;
}
@@ -3850,9 +3853,10 @@
nline++;/* query type */
qt = (int) strtol(nline, nline, 0);
- if (qt != Q_BLOCK || result == NULL)
+ if (result == NULL || (qt != Q_BLOCK !result-commentonly))
result = new_result(hdl);
result-querytype = qt;
+ result-commentonly = 0;
nline++;/* skip space */
switch (qt) {
@@ -3908,6 +3912,8 @@
n = slice_row(line, NULL, anchors, lens, 10, '#');
+ result-commentonly = 0;
+
tag = etag + 1;
while (*tag isspace((int) (unsigned char) *tag))
tag++;
diff -r 5d2c2a67f899 -r 084dad091d4a
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
Tue Jul 13 10:26:21 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
Tue Jul 13 10:54:12 2010 +0200
@@ -25,30 +25,6 @@
# 12:59:51 mclient -lsql -umonetdb -Pmonetdb --host=rig --port=33577
# 12:59:51
-% .t # table_name
-% name # name
-% varchar # type
-% 12 # length
-[ _columns ]
-[ _tables]
-[ args ]
-[ auths ]
-[ columns]
-[ connections]
-[ db_user_info ]
-[ dependencies ]
-[ functions ]
-[ idxs ]
-[ keycolumns ]
-[ keys ]
-[ privileges ]
-[ schemas]
-[ sequences ]
-[ tables ]
-[ triggers ]
-[ types ]
-[ user_role ]
-[ users ]
CREATE TABLE sys.triggers (
id int,
name varchar(1024),
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 11489b108f40 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11489b108f40
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/MonetDB-geom.spec
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (239 lines):
diff -r 084dad091d4a -r 11489b108f40 .hgtags
--- a/.hgtags Tue Jul 13 10:54:12 2010 +0200
+++ b/.hgtags Tue Jul 13 11:23:16 2010 +0200
@@ -419,3 +419,5 @@
e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
+9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
+a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
diff -r 084dad091d4a -r 11489b108f40 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Jul 13 11:23:16 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Jul 13 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100713
+- Rebuilt.
+
* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100712
- Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB/debian/changelog Tue Jul 13 11:23:16 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.3-20100713) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 13 Jul 2010 11:17:24 +0200
+
monetdb (1.38.3-20100712) unstable; urgency=low
* Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Jul 13 11:23:16 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Jul 13 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100713
+- Rebuilt.
+
* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100712
- Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jul 13 11:23:16 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.3-20100713) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 13 Jul 2010 11:17:24 +0200
+
monetdb4-server (4.38.3-20100712) unstable; urgency=low
* Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Tue Jul 13 11:23:16 2010 +0200
@@ -1,7 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org
-- Fixed bug 2597: This bug manifested itself in rank queries in SQL but
- was a bug in the mergetable optimizer.
-
diff -r 084dad091d4a -r 11489b108f40 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Tue Jul 13 11:23:16 2010 +0200
@@ -213,6 +213,13 @@
%{_libdir}/*.so
%changelog
+* Tue Jul 13 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100713
+- Rebuilt.
+
+* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100713
+- Fixed bug 2597: This bug manifested itself in rank queries in SQL but
+was a bug in the mergetable optimizer.
+
* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100712
- Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jul 13 10:54:12 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Jul 13 11:23:16 2010 +0200
@@ -1,3 +1,16 @@
+monetdb5-server (5.20.3-20100713) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 13 Jul 2010 11:17:24 +0200
+
+monetdb5-server (5.20.3-20100713) unstable; urgency=low
+
+ * Fixed bug 2597: This bug manifested itself in rank queries in SQL but
+was a bug in the mergetable optimizer.
+
+ -- Sjoerd Mullender sjo...@acm.org Mon, 12 Jul 2010 11:17:24 +0200
+
monetdb5-server (5.20.3-20100712) unstable; urgency=low
* Rebuilt.
diff -r 084dad091d4a -r 11489b108f40 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Tue Jul 13
MonetDB: default - Merge with Jun2010 branch.
Changeset: 0e0de722f848 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e0de722f848
Modified Files:
sql/ChangeLog.Jun2010
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (75 lines):
diff -r 0eea43253a16 -r 0e0de722f848 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Mon Jul 12 11:19:20 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Mon Jul 12 11:28:28 2010 +0200
@@ -7,3 +7,7 @@
work, again, that were broken since Jun 22 2010
triggering errors like ORDER BY: missing select operator
+* Fri Jul 9 2010 Fabian Groffen fab...@cwi.nl
+- Removed false connection warning about missing SQL script (could not
+ read createdb.sql) received by the client upon first connect on a
+ newly created database. Bug #2591
diff -r 0eea43253a16 -r 0e0de722f848
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Mon Jul 12 11:19:20
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Mon Jul 12 11:28:28
2010 +0200
@@ -1305,12 +1305,6 @@
}
Entry
{
-MsmKey = 8:_CEF22C247B2E476FBBAB8046DDBC0F1A
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
MsmKey = 8:_CF5DC8BD4BFA4D7EA31F3B1BBB4EB5A1
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
diff -r 0eea43253a16 -r 0e0de722f848 sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj Mon Jul 12 11:19:20 2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj Mon Jul 12 11:28:28 2010 +0200
@@ -33,12 +33,6 @@
}
Entry
{
-MsmKey = 8:_4E285A2638A04D71AC11F06FA1EF0AA7
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
MsmKey = 8:_60556A506BDF4F0A83013CA0B54EDC9E
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
diff -r 0eea43253a16 -r 0e0de722f848 sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj Mon Jul 12 11:19:20 2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj Mon Jul 12 11:28:28 2010 +0200
@@ -93,12 +93,6 @@
}
Entry
{
-MsmKey = 8:_A095E6625D794D4AA25BDDFC71B855D4
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
MsmKey = 8:_A83A85D1131B4E8E95AB48367C69141D
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
diff -r 0eea43253a16 -r 0e0de722f848
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Mon Jul 12
11:19:20 2010 +0200
+++ b/sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Mon Jul 12
11:28:28 2010 +0200
@@ -921,12 +921,6 @@
}
Entry
{
-MsmKey = 8:_981F356AD9144ACFA0F368DEC3CCD599
-OwnerKey = 8:_UNDEFINED
-MsmSig = 8:_UNDEFINED
-}
-Entry
-{
MsmKey = 8:_98E6FA0B4886462284DC79CA1CA41987
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 83cbe43676dc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83cbe43676dc
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/MonetDB-geom.spec
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (260 lines):
diff -r 0e0de722f848 -r 83cbe43676dc .hgtags
--- a/.hgtags Mon Jul 12 11:28:28 2010 +0200
+++ b/.hgtags Mon Jul 12 12:41:02 2010 +0200
@@ -417,3 +417,5 @@
700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
700a31b47b8a8fd449607d16f14c5c96d3c503cb Jun2010_3
e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
+e4fe1c3cabfee2bba0b620aee6c3e9d569d37e17 Jun2010_3
+9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon Jul 12 12:41:02 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb (1.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon Jul 12 12:41:02 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender sjo...@acm.org - 4.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB4/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb4-server (4.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon Jul 12 12:41:02 2010 +0200
@@ -213,6 +213,9 @@
%{_libdir}/*.so
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender sjo...@acm.org - 5.20.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/MonetDB5/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5-server (5.20.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Mon, 12 Jul 2010 12:00:27 +0200
+
monetdb5-server (5.20.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Mon Jul 12 11:28:28 2010 +0200
+++ b/clients/MonetDB-client.spec Mon Jul 12 12:41:02 2010 +0200
@@ -301,6 +301,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Mon Jul 12 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100712
+- Rebuilt.
+
* Fri Jul 09 2010 Sjoerd Mullender sjo...@acm.org - 1.38.3-20100709
- Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc clients/debian/changelog
--- a/clients/debian/changelog Mon Jul 12 11:28:28 2010 +0200
+++ b/clients/debian/changelog Mon Jul 12 12:41:02 2010 +0200
@@ -1,3 +1,9 @@
+monetdb-client (1.38.3-20100712) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Mon, 12 Jul 2010 12:00:28 +0200
+
monetdb-client (1.38.3-20100709) unstable; urgency=low
* Rebuilt.
diff -r 0e0de722f848 -r 83cbe43676dc geom/MonetDB-geom.spec
--- a/geom/MonetDB-geom.specMon Jul 12 11:28:28 2010 +0200
+++
MonetDB: default - Merge with Jun2010 branch.
Changeset: 833dda1332e3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=833dda1332e3 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (42 lines): diff -r 5733c6d8219b -r 833dda1332e3 sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql --- a/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql Mon Jul 12 19:59:02 2010 +0200 +++ b/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.sql Mon Jul 12 22:04:34 2010 +0200 @@ -5,10 +5,10 @@ INSERT INTO t1114540 VALUES (11); INSERT INTO t1114540 VALUES (12); -SELECT * FROM t1114540 WHERE (id=10) OR (id=11); -SELECT * FROM t1114540 WHERE ((id=10) OR (id=11)) OR id=12; -SELECT id FROM t1114540 WHERE id11 OR id11; -SELECT id FROM t1114540 WHERE id11 OR id11; -SELECT id FROM t1114540 WHERE id=11 OR id=10; -SELECT id FROM t1114540 WHERE id12 OR id10; -SELECT id FROM t1114540 WHERE id11 OR id IS NULL; +SELECT * FROM t1114540 WHERE (id=10) OR (id=11) ORDER BY id; +SELECT * FROM t1114540 WHERE ((id=10) OR (id=11)) OR id=12 ORDER BY id; +SELECT id FROM t1114540 WHERE id11 OR id11 ORDER BY id; +SELECT id FROM t1114540 WHERE id11 OR id11 ORDER BY id; +SELECT id FROM t1114540 WHERE id=11 OR id=10 ORDER BY id; +SELECT id FROM t1114540 WHERE id12 OR id10 ORDER BY id; +SELECT id FROM t1114540 WHERE id11 OR id IS NULL ORDER BY id; diff -r 5733c6d8219b -r 833dda1332e3 sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out --- a/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out Mon Jul 12 19:59:02 2010 +0200 +++ b/sql/src/test/BugDay_2005-11-09_2.9.3/Tests/or_select.SF-1114540.stable.out Mon Jul 12 22:04:34 2010 +0200 @@ -51,15 +51,15 @@ % id # name % int # type % 2 # length +[ 10 ] [ 12 ] -[ 10 ] % sys.t1114540 # table_name % id # name % int # type % 2 # length +[ 10 ] [ 11 ] [ 12 ] -[ 10 ] % sys.t1114540 # table_name % id # name % int # type ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 842285ac27fb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=842285ac27fb Modified Files: Branch: default Log Message: Merge with Jun2010 branch. Reenable test: it seems to work. diffs (12 lines): diff -r 7d1387facf87 -r 842285ac27fb sql/src/test/BugTracker-2009/Tests/All --- a/sql/src/test/BugTracker-2009/Tests/AllFri Jul 09 16:39:45 2010 +0200 +++ b/sql/src/test/BugTracker-2009/Tests/AllFri Jul 09 17:11:14 2010 +0200 @@ -87,7 +87,7 @@ prepare_commit_execute.SF-2606020 ambiguous_order_by.SF-2827916 except_error_wrong.SF-2808409 -#table-leftovers.SF-2779462 +table-leftovers.SF-2779462 Floating_point_exception.SF-2791356 Division_by_zero_error.SF-2791361 copy_into_error_off_by_one.SF-2833696 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: e49ebce55b48 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e49ebce55b48
Modified Files:
sql/ChangeLog.Jun2010
sql/src/server/rel_bin.mx
sql/src/server/rel_optimizer.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 529 to 300 lines):
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Code.c Wed Jul 07 10:27:21 2010 +0200
@@ -41,7 +41,8 @@
char *s;
fname = d-d_cmd;
- for (s = fname; *s !isspace((int) (*s)); s++) ;
+ for (s = fname; *s !isspace((int) (*s)); s++)
+ ;
if (isspace((int) (*s)))
*s = 0;
if (s == fname) {
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Def.c Wed Jul 07 10:27:21 2010 +0200
@@ -111,7 +111,8 @@
d = NwDef(Bfile, mod, sec, 0, mx_file);
d-d_cmd = name;
- while ((line = NextLine()) *line != '@') ;
+ while ((line = NextLine()) *line != '@')
+ ;
PrevLine();
while (!EofFile()) {
dir = DefDir();
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Display.c
--- a/buildtools/Mx/Display.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Display.c Wed Jul 07 10:27:21 2010 +0200
@@ -144,7 +144,8 @@
/* find out the full name in 'full', the basename in 's', end in 't' */
strncpy(full, file, sizeof(full));
- for (s = full; s[1]; s++) ;
+ for (s = full; s[1]; s++)
+ ;
while (s = full *s != DIR_SEP
#ifdef WIN32
*s != '/'
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Form.c
--- a/buildtools/Mx/Form.c Wed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Form.c Wed Jul 07 10:27:21 2010 +0200
@@ -52,7 +52,8 @@
char *getlogin();
char *dstbak = NULL;
- for (d = defs; d defs + ndef (d-d_dir != Bfile); dirbak =
d-d_dir, d++) ;
+ for (d = defs; d defs + ndef (d-d_dir != Bfile); dirbak =
d-d_dir, d++)
+ ;
for (; d defs + ndef; dirbak = d-d_dir, d++) {
codeline = d-d_line;
again:switch (d-d_dir) {
diff -r a087e83ab53e -r e49ebce55b48 buildtools/Mx/Io.c
--- a/buildtools/Mx/Io.cWed Jul 07 08:58:58 2010 +0200
+++ b/buildtools/Mx/Io.cWed Jul 07 10:27:21 2010 +0200
@@ -410,14 +410,15 @@
char *
NextLine(void)
{
- mx_line++;
if (fullbuf) {
+ mx_line++;
fullbuf = 0;
return linebuf;
} else {
char *s, *t;
do {
+ mx_line++;
s = fgets(linebuf, MAXLINE, ifile);
} while (s == NULL !EofFile());
diff -r a087e83ab53e -r e49ebce55b48 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Wed Jul 07 10:27:21 2010 +0200
@@ -1,3 +1,8 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Wed Jul 7 2010 Niels Nes ni...@cwi.nl
+- Fixed bug 2581. Completed the implementation of handling boolean types in
prepare statements.
+- Fix bug 2582. Statements with 'constant in ( )' are now handled properly.
+- Fixed bug 2583 + added test. The assert was incorrect.
+
diff -r a087e83ab53e -r e49ebce55b48 sql/src/server/rel_bin.mx
--- a/sql/src/server/rel_bin.mx Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/src/server/rel_bin.mx Wed Jul 07 10:27:21 2010 +0200
@@ -182,9 +182,9 @@
are_equality_exps( list *exps )
{
if (list_length(exps) == 1) {
- sql_exp *e = exps-h-data, *re = e-r;
-
- if (e-type == e_cmp e-flag == cmp_equal re-card ==
CARD_ATOM)
+ sql_exp *e = exps-h-data, *le = e-l, *re = e-r;
+
+ if (e-type == e_cmp e-flag == cmp_equal le-card !=
CARD_ATOM re-card == CARD_ATOM)
return 1;
if (e-type == e_cmp e-flag == cmp_or)
return (are_equality_exps(e-l)
diff -r a087e83ab53e -r e49ebce55b48 sql/src/server/rel_optimizer.mx
--- a/sql/src/server/rel_optimizer.mx Wed Jul 07 08:58:58 2010 +0200
+++ b/sql/src/server/rel_optimizer.mx Wed Jul 07 10:27:21 2010 +0200
@@ -3315,7 +3315,6 @@
}
}
}
- assert(list_length(exps) == list_length(es));
/* fix the destroy function */
cols-destroy = NULL;
list_destroy(cols);
diff -r a087e83ab53e -r
MonetDB: default - Merge with Jun2010 branch.
Changeset: cde674e2ec28 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cde674e2ec28 Modified Files: .hgignore Branch: default Log Message: Merge with Jun2010 branch. diffs (18 lines): diff -r e49ebce55b48 -r cde674e2ec28 .hgignore --- a/.hgignore Wed Jul 07 10:27:21 2010 +0200 +++ b/.hgignore Wed Jul 07 10:32:38 2010 +0200 @@ -34,12 +34,14 @@ ^buildtools/burg/gram\.[ch]$ ^buildtools/burg/y\.tab\.h$ ^buildtools/burg/ylwrap$ +^buildtools/depcomp$ ^buildtools/dummy.h.in$ ^buildtools/mel/.*\.[ch]$ ^buildtools/mel/.*\.cxx$ ^buildtools/mel/depcomp$ ^buildtools/mel/mel\.ll$ ^buildtools/mel/mel\.yy$ +^buildtools/ylwrap$ ^clients/NT/Runmclient\.bat$ ^java/NT/.*\.jar$ ^java/NT/nl/ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 26e5652ee43a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26e5652ee43a
Modified Files:
.hgignore
sql/ChangeLog.Jun2010
sql/src/server/sql_parser.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (89 lines):
diff -r 4382914beeb2 -r 26e5652ee43a .hgignore
--- a/.hgignore Wed Jul 07 12:45:14 2010 +0200
+++ b/.hgignore Wed Jul 07 13:29:10 2010 +0200
@@ -35,6 +35,10 @@
^buildtools/burg/y\.tab\.h$
^buildtools/burg/ylwrap$
^buildtools/depcomp$
+^buildtools/doc/HowToRelease\.html$
+^buildtools/doc/HowToRelease\.pdf$
+^buildtools/doc/windowsbuild\.html$
+^buildtools/doc/windowsbuild\.pdf$
^buildtools/dummy.h.in$
^buildtools/mel/.*\.[ch]$
^buildtools/mel/.*\.cxx$
diff -r 4382914beeb2 -r 26e5652ee43a buildtools/doc/Makefile
--- a/buildtools/doc/Makefile Wed Jul 07 12:45:14 2010 +0200
+++ b/buildtools/doc/Makefile Wed Jul 07 13:29:10 2010 +0200
@@ -1,7 +1,13 @@
-all: HowToRelease.html windowsbuild.html
+all: HowToRelease.html windowsbuild.html HowToRelease.pdf windowsbuild.pdf
HowToRelease.html: HowToRelease.rst
- rst2html.py HowToRelease.rst HowToRelease.html
+ rst2html HowToRelease.rst HowToRelease.html
windowsbuild.html: windowsbuild.rst
- rst2html.py windowsbuild.rst windowsbuild.html
+ rst2html windowsbuild.rst windowsbuild.html
+
+HowToRelease.pdf: HowToRelease.rst
+ rst2pdf HowToRelease.rst
+
+windowsbuild.pdf: windowsbuild.rst
+ rst2pdf windowsbuild.rst
diff -r 4382914beeb2 -r 26e5652ee43a sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Wed Jul 07 12:45:14 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Wed Jul 07 13:29:10 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Wed Jul 7 2010 Fabian Groffen fab...@cwi.nl
+- Make TEXT a separate keyword, separating it from CLOB, such that we can
sloppily allow TEXT to appear as a column name, since it seems not to be in the
standard as reserved keyword.
+
* Wed Jul 7 2010 Niels Nes ni...@cwi.nl
- Fixed bug 2581. Completed the implementation of handling boolean types in
prepare statements.
- Fix bug 2582. Statements with 'constant in ( )' are now handled properly.
diff -r 4382914beeb2 -r 26e5652ee43a sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx Wed Jul 07 12:45:14 2010 +0200
+++ b/sql/src/server/sql_parser.mx Wed Jul 07 13:29:10 2010 +0200
@@ -642,7 +642,7 @@
IDENT aTYPE ALIAS AGGR RANK sqlINT HEXADECIMAL INTNUM APPROXNUM
USING
ALL ANY SOME GLOBAL CAST CONVERT
- CHARACTER VARYING LARGE OBJECT VARCHAR CLOB BINARY sqlBLOB
+ CHARACTER VARYING LARGE OBJECT VARCHAR CLOB TEXT BINARY sqlBLOB
sqlDECIMAL sqlFLOAT
TINYINT SMALLINT BIGINT sqlINTEGER
sqlDOUBLE sqlREAL PRECISION PARTIAL SIMPLE ACTION CASCADE RESTRICT
@@ -4542,6 +4542,7 @@
clob:
CLOB{ $$ = $1; }
+ | TEXT{ $$ = $1; }
| CHARACTER LARGE OBJECT { $$ = $1; }
;
blob:
@@ -4605,6 +4606,7 @@
| SQL_EXPLAIN { $$ = sa_strdup(SA, explain); }
| SQL_DEBUG { $$ = sa_strdup(SA, debug); }
| SQL_TRACE { $$ = sa_strdup(SA, trace); }
+| TEXT{ $$ = sa_strdup(SA, text); }
| AUTO_COMMIT { $$ = sa_strdup(SA, auto_commit); }
/* SQL/XML non reserved words */
| STRIP { $$ = sa_strdup(SA, strip); }
diff -r 4382914beeb2 -r 26e5652ee43a sql/src/server/sql_scan.mx
--- a/sql/src/server/sql_scan.mxWed Jul 07 12:45:14 2010 +0200
+++ b/sql/src/server/sql_scan.mxWed Jul 07 13:29:10 2010 +0200
@@ -119,8 +119,8 @@
keywords_insert(OBJECT, OBJECT);
keywords_insert(CLOB, CLOB);
keywords_insert(BLOB, sqlBLOB);
- keywords_insert(TEXT, CLOB);
- keywords_insert(TINYTEXT, CLOB);
+ keywords_insert(TEXT, TEXT);
+ keywords_insert(TINYTEXT, TEXT);
keywords_insert(STRING, CLOB);/* ? */
keywords_insert(CHECK, CHECK);
keywords_insert(CONSTRAINT, CONSTRAINT);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: c2fce286eb95 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2fce286eb95
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
If dumping fails (e.g. because of closed pipe in \|less), rollback our
transaction.
diffs (truncated from 405 to 300 lines):
diff -r 5e050ef2e154 -r c2fce286eb95 clients/src/mapiclient/dump.c
--- a/clients/src/mapiclient/dump.c Wed Jul 07 14:13:43 2010 +0200
+++ b/clients/src/mapiclient/dump.c Wed Jul 07 15:09:15 2010 +0200
@@ -1109,32 +1109,20 @@
if (!describe)
stream_printf(toConsole, START TRANSACTION;\n);
- if ((hdl = mapi_query(mid, start)) == NULL || mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, start)) == NULL || mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
sname = get_schema(mid);
if (sname == NULL)
- return 1;
+ goto bailout2;
if (strcmp(sname, sys) == 0 || strcmp(sname, tmp) == 0) {
free(sname);
sname = NULL;
/* dump roles */
- if ((hdl = mapi_query(mid, roles)) == NULL || mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, roles)) == NULL || mapi_error(mid))
+ goto bailout;
while (mapi_fetch_row(hdl) != 0) {
char *name = mapi_fetch_field(hdl, 0);
@@ -1143,46 +1131,26 @@
quoted_print(toConsole, name);
stream_printf(toConsole, ;\n);
}
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- return 1;
- }
+ if (mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
/* dump users, part 1 */
/* first make sure the password_hash function exists */
- if ((hdl = mapi_query(mid, chkhash)) == NULL ||
mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, chkhash)) == NULL || mapi_error(mid))
+ goto bailout;
create_hash_func = mapi_rows_affected(hdl) == 0;
mapi_close_handle(hdl);
if (create_hash_func) {
- if ((hdl = mapi_query(mid, createhash)) == NULL ||
mapi_error(mid)) {
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, createhash)) == NULL ||
+ mapi_error(mid))
+ goto bailout;
mapi_close_handle(hdl);
}
- if ((hdl = mapi_query(mid, users1)) == NULL || mapi_error(mid))
{
- if (hdl) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return 1;
- }
+ if ((hdl = mapi_query(mid, users1)) == NULL || mapi_error(mid))
+ goto bailout;
while (mapi_fetch_row(hdl) != 0) {
char *uname = mapi_fetch_field(hdl, 0);
@@ -1193,35 +1161,22 @@
quoted_print(toConsole, uname);
stream_printf(toConsole, WITH ENCRYPTED PASSWORD '%s'
NAME '%s' SCHEMA \sys\;\n, pwhash, fullname);
}
- if (mapi_error(mid)) {
- mapi_explain_query(hdl, stderr);
- mapi_close_handle(hdl);
- return 1;
- }
+ if (mapi_error(mid))
+ goto bailout;
MonetDB: default - Merge with Jun2010 branch.
Changeset: 650139cd67ea for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=650139cd67ea Modified Files: sql/ChangeLog.Jun2010 Branch: default Log Message: Merge with Jun2010 branch. diffs (16 lines): diff -r a9513b8ec372 -r 650139cd67ea sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Tue Jul 06 10:08:08 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Tue Jul 06 12:29:05 2010 +0200 @@ -1,6 +1,12 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Mon Jul 5 2010 Niels Nes ni...@cwi.nl +- Fixed bug in zero_or_one +- Fixed bug in dead code elimination for projections with distinct +- Fixed bug handling join with constant values on both sides (like group results and constants) +- fixed bug in UPDATE TABLE when updating multiple rows + * Wed Jun 30 2010 Stefan Manegold stefan.maneg...@cwi.nl - fixed bug 2564: in case group by column is not found as alias in projection list, ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.: Change default be...
Changeset: 94a4f2d07c5a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94a4f2d07c5a
Modified Files:
Branch: default
Log Message:
Merge from Jun2010 branch.: Change default behavior of Maddlog.
By default, don't commit, but remind people that they have to commit.
Also remind people that the have to push.
diffs (47 lines):
diff -r f2c4b449e6fd -r 94a4f2d07c5a buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog Tue Jul 06 17:17:40 2010 +0200
+++ b/buildtools/conf/Maddlog Tue Jul 06 17:36:54 2010 +0200
@@ -28,7 +28,7 @@
exit -1
fi
-nocommit=
+nocommit=true
while [ $# -gt 0 ]; do
case $1 in
--logfile=*)
@@ -44,8 +44,8 @@
CL=${1#-f}
shift
;;
---nocommit)
- nocommit=true
+--commit)
+ nocommit=
shift
;;
--)
@@ -57,7 +57,7 @@
$0: unknown option $1
Valid options are:
--logfile=filename (-f filename)
- --nocommit
+ --commit
EOF
exit 1
;;
@@ -135,7 +135,12 @@
mv $file $CL
+hg add $CL /dev/null
+
if [ ! $nocommit ]; then
-hg add $CL /dev/null
- hg commit -m $msg $CL
+hg commit -m $msg $CL
+else
+hg diff $CL
+echo Don't forget to COMMIT.
fi
+echo Don't forget to PUSH.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: If only one thread...
Changeset: f35835c337d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f35835c337d4
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
Branch: default
Log Message:
Merge from Jun2010 branch: If only one thread, don't reorder work.
This should make that the test sql/src/test/copy/Tests/overflow_error.sql
becomes stable.
diffs (12 lines):
diff -r b76d01a2549b -r f35835c337d4 MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mxMon Jul 05 10:45:11 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mxMon Jul 05 12:29:45 2010 +0200
@@ -377,7 +377,7 @@
if ( task-rounds 8 )
return;
/* simple round robin the first time */
- if ( task-rounds++ == 0){
+ if ( threads == 1 || task-rounds++ == 0){
for ( i=j=0; i nr_attrs; i++, j++)
ptask[ j % threads].cols[i] = task-cols[i];
return;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Hardening: check f...
Changeset: 0db23ac1d990 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0db23ac1d990
Modified Files:
MonetDB/src/gdk/gdk_bat.mx
MonetDB5/src/mal/mal_function.mx
MonetDB5/src/mal/mal_instruction.mx
MonetDB5/src/mal/mal_profiler.mx
Branch: default
Log Message:
Merge from Jun2010 branch: Hardening: check for allocation failures and stuff
like that.
diffs (91 lines):
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxMon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Jul 05 12:31:17 2010 +0200
@@ -102,6 +102,8 @@
@c
BATstore *bs = (BATstore *) GDKzalloc(sizeof(BATstore));
+ if (bs == NULL)
+ return NULL;
@-
assert needed in the kernel to get symbol eprintf resolved.
Else modules using assert fail to load.
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_box.mx
--- a/MonetDB5/src/mal/mal_box.mx Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_box.mx Mon Jul 05 12:31:17 2010 +0200
@@ -599,12 +599,13 @@
int i;
b = BATnew(TYPE_int, TYPE_str, (BUN) MAXSPACES);
+ if (b == NULL)
+ throw(MAL, box.getBoxNames, MAL_MALLOC_FAIL);
for (i = 0; i topbox; i++)
if (malbox[i] != NULL) {
BUNins(b, i, malbox[i]-name, FALSE);
}
- BBPincref(*bid = b-batCacheid, TRUE);
- BBPunfix(*bid);
+ BBPkeepref(*bid = b-batCacheid);
return MAL_SUCCEED;
}
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_function.mx
--- a/MonetDB5/src/mal/mal_function.mx Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_function.mx Mon Jul 05 12:31:17 2010 +0200
@@ -115,7 +115,11 @@
InstrPtr p;
s = newSymbol(nme,kind);
+ if (s == NULL)
+ return NULL;
p = newInstruction(NULL,kind);
+ if (p == NULL)
+ return NULL;
setModuleId(p, mod);
setFunctionId(p, nme);
setDestVar(p, newVariable(s-def,GDKstrdup(nme),TYPE_any));
@@ -125,6 +129,8 @@
InstrPtr newCall(Module scope, str fcnname, int kind){
InstrPtr p;
p= newInstruction(NULL,kind);
+ if (p == NULL)
+ return NULL;
setModuleScope(p, scope);
setFunctionId(p, putName(fcnname,strlen(fcnname)));
return p;
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx Mon Jul 05 12:31:17 2010 +0200
@@ -600,7 +600,7 @@
}
cur = (Symbol) GDKzalloc(sizeof(SymRecord));
if (cur == NULL) {
- GDKerror(@1:MAL_MALLOC_FAIL);
+ GDKerror(newSymbol:MAL_MALLOC_FAIL);
return NULL;
}
cur-name = putName(nme,strlen(nme));
@@ -990,6 +990,8 @@
}
if (p == NULL) {
p = GDKzalloc(MAXARG * sizeof(p-maxarg) + sizeof(InstrRecord));
+ if (p == NULL)
+ return NULL;
p-maxarg = MAXARG;
}
p-typechk = TYPE_UNKNOWN;
diff -r f35835c337d4 -r 0db23ac1d990 MonetDB5/src/mal/mal_profiler.mx
--- a/MonetDB5/src/mal/mal_profiler.mx Mon Jul 05 12:29:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_profiler.mx Mon Jul 05 12:31:17 2010 +0200
@@ -1033,10 +1033,10 @@
}
b = BATnew(TYPE_void, tt, 1 16);
- BATseqbase(b, 0);
if (b == NULL)
return NULL;
+ BATseqbase(b, 0);
BATkey(b, TRUE);
BBPrename(b-batCacheid, buf);
BATmode(b, PERSISTENT);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 1436cc5f795a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1436cc5f795a
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (52 lines):
diff -r 9e20771480ee -r 1436cc5f795a sql/src/server/rel_updates.mx
--- a/sql/src/server/rel_updates.mx Mon Jul 05 14:45:18 2010 +0200
+++ b/sql/src/server/rel_updates.mx Mon Jul 05 16:27:13 2010 +0200
@@ -391,25 +391,37 @@
exp_kind ek = {type_value, card_column, FALSE};
v = rel_value_exp(sql, rel_val, a, sql_sel,
ek);
- if (v) {
- if (rel_val) {
- list *exps =
rel_projections(sql, r, NULL, 0, 1);
- sql_rel *nr =
rel_project(rel_crossproduct(rel_dup(r-l), rel_val, op_join), exps);
- rel_destroy(r);
- r = nr;
- }
- } else {
+
+ if (!v) {
sql-errstr[0] = 0;
sql-session-status = status;
v = rel_value_exp(sql, r, a, sql_sel,
ek);
+ }
+ if (!v || (v = rel_check_type(sql, c-type, v,
type_equal)) == NULL) {
+ if (v)
+ exp_destroy(v);
+ rel_destroy(r);
+ return NULL;
+ }
+ if (rel_val) {
+ sql_rel *nr;
+ list *exps;
+
+ if (!exp_name(v))
+ exp_label(v, ++sql-label);
+ rel_val = rel_project(rel_val,
rel_projections(sql, rel_val, NULL, 0, 1));
+ rel_project_add_exp(sql, rel_val, v);
+ exps = rel_projections(sql, r, NULL, 0,
1);
+ nr =
rel_project(rel_crossproduct(rel_dup(r-l), rel_val, op_join), exps);
+ rel_destroy(r);
+ r = nr;
+ v = exp_column(NULL, exp_name(v),
exp_subtype(v), v-card, has_nil(v), is_intern(v));
}
} else {
v = exp_atom(atom_general(c-type, NULL, 0));
}
- if (!v || (v = rel_check_type(sql, c-type, v,
type_equal)) == NULL) {
- if (v)
- exp_destroy(v);
+ if (!v) {
rel_destroy(r);
return NULL;
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 002d12460c66 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=002d12460c66 Modified Files: Branch: default Log Message: Merge with Jun2010 branch. diffs (14 lines): diff -r 3453a035be69 -r 002d12460c66 clients/ChangeLog.Jun2010 --- a/clients/ChangeLog.Jun2010 Mon Jul 05 17:35:28 2010 +0200 +++ b/clients/ChangeLog.Jun2010 Mon Jul 05 18:05:28 2010 +0200 @@ -1,6 +1,10 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Mon Jul 5 2010 Sjoerd Mullender sjo...@acm.org +- Implemented dumping of GRANT statements. + This fixes bug 2574. + * Thr Jul 1 2010 Fabian Groffen fab...@cwi.nl - Fix implementation of mapi_mapiuri to deal with UNIX socket urls properly. This fixes one part of Bug #2567. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: adb0111d066c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=adb0111d066c
Modified Files:
MonetDB/MonetDB.spec
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
MonetDB/NT/rules.msc
MonetDB/configure.ag
MonetDB/src/gdk/libbat.rc
MonetDB/vertoo.data
MonetDB4/MonetDB-server.spec
MonetDB4/NT/MonetDB.iss
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
MonetDB4/NT/rules.msc
MonetDB4/VERSION
MonetDB4/configure.ag
MonetDB4/src/monet/libmonet.rc
MonetDB4/vertoo.data
MonetDB5/MonetDB-server.spec
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
MonetDB5/NT/rules.msc
MonetDB5/VERSION
MonetDB5/configure.ag
MonetDB5/src/mal/libmonetdb5.rc
MonetDB5/vertoo.data
clients/MonetDB-client.spec
clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj
clients/NT/rules.msc
clients/configure.ag
clients/src/mapilib/Mapi.rc
clients/src/odbc/driver/driver.rc
clients/src/odbc/winsetup/setup.rc
clients/vertoo.data
geom/MonetDB-geom.spec
geom/NT/rules.msc
geom/configure.ag
geom/vertoo.data
java/configure.ag
java/vertoo.data
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/rules.msc
pathfinder/VERSION
pathfinder/configure.ag
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/xrpc/admin/title.html.in
pathfinder/vertoo.data
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/NT/rules.msc
sql/VERSION
sql/configure.ag
sql/src/storage/store.mx
sql/vertoo.data
template/configure.ag
template/vertoo.data
testing/MonetDB-testing.spec
testing/NT/rules.msc
testing/configure.ag
testing/vertoo.data
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (11 lines):
diff -r 3d55f64b5d3b -r adb0111d066c sql/src/storage/store.mx
--- a/sql/src/storage/store.mx Fri Jul 02 14:17:05 2010 +0200
+++ b/sql/src/storage/store.mx Fri Jul 02 15:54:34 2010 +0200
@@ -846,6 +846,7 @@
GDKfatal(SQL schema missing or incompatible,
rebuild from archive);
}
s = n-data;
+ s-base.id = sid;
} else {
s = ZNEW(sql_schema);
v = table_funcs.column_find_value(tr, find_sql_column(ss,
name), rid);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: e034e2d4a3c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e034e2d4a3c3
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (65 lines):
diff -r bd33590d3ab8 -r e034e2d4a3c3 MonetDB/HowToStart.rst
--- a/MonetDB/HowToStart.rstMon Jun 28 20:30:10 2010 +0200
+++ b/MonetDB/HowToStart.rstWed Jun 30 10:28:21 2010 +0200
@@ -20,7 +20,7 @@
a native Windows system (NT, 2000, XP) see the instructions in the
file `../buildtools/doc/windowsbuild.rst`__.
-__ http://monetdb.cwi.nl/downloads/
+__ http://dev.monetdb.org/downloads/
__ Windows-Installation.html
The Suite
@@ -137,7 +137,7 @@
document loader will not be compiled at all in that case.
Current Linux distributions all come with libxml2.
-__ http://monetdb.cwi.nl/downloads/sources/
+__ http://dev.monetdb.org/downloads/sources/
__ http://www.gnu.org/software/autoconf/
__ http://www.gnu.org/software/automake/
__ http://www.gnu.org/software/libtool/
@@ -178,7 +178,7 @@
the pre-packaged source distribution, you can skip this section and
proceed to `Bootstrap, Configure and Make`_.
-__ http://monetdb.cwi.nl/downloads/
+__ http://dev.monetdb.org/downloads/
Mercurial clone
~~~
diff -r bd33590d3ab8 -r e034e2d4a3c3 MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx Mon Jun 28 20:30:10 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 10:28:21 2010 +0200
@@ -372,22 +372,20 @@
# if defined(HAVE_SYSCONF) defined(_SC_PHYS_PAGES)
_MT_npages = sysconf(_SC_PHYS_PAGES);
# else
-# if defined(HAVE_GETRLIMIT) defined(RLIMIT_RSS)
+# if defined(HAVE_SYS_SYSCTL_H) defined(HW_MEMSIZE)
{
- struct rlimit rl;
+ int mib[2] = { CTL_HW, HW_MEMSIZE };
+ unsigned int namelen = sizeof(mib) / sizeof(mib[0]);
+ uint64_t size;
+ size_t len = sizeof(size);
- /* Specifies the limit (in pages) of the process's resident set
-* (the number of virtual pages resident in RAM). This limit
-* only has effect in Linux 2.4.x, x 30, and there only
-* affects calls to madvise() specifying MADV_WILLNEED */
- /* FIXME: this looks like a total wrong thing to check in any
-* case to me */
- getrlimit(RLIMIT_RSS, rl);
- _MT_npages = rl.rlim_cur / _MT_pagesize;
+ if (sysctl(mib, namelen, size, len, NULL, 0) = 0) {
+ _MT_npages = size / _MT_pagesize;
+ }
}
# else
#error don't know how to get the amount of physical memory for your OS
-# endif /* getrlimit */
+# endif /* sysctl */
# endif /* sysconf */
# endif/* GlobalMemoryStatus */
#endif /* GlobalMemoryStatusEx */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jun2010 branch.
Changeset: 48b4be11fdf3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48b4be11fdf3
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 423 to 300 lines):
diff -r 7f53bc7587ca -r 48b4be11fdf3 .hgtags
--- a/.hgtags Mon Jun 28 06:23:17 2010 +0200
+++ b/.hgtags Mon Jun 28 09:44:16 2010 +0200
@@ -408,3 +408,5 @@
659965ec908548fa64649bce37f84e245428ce7b Jun2010_1
659965ec908548fa64649bce37f84e245428ce7b Jun2010_1
d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1
+d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1
+c0927c19d26910bb3fb5a5acba438a0ca5bba182 Jun2010_1
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon Jun 28 09:44:16 2010 +0200
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100625
+- Rebuilt.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
- Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB/debian/changelog Mon Jun 28 09:44:16 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
monetdb (1.38.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon Jun 28 09:44:16 2010 +0200
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100625
+- Rebuilt.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100622
- Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB4/debian/changelog Mon Jun 28 09:44:16 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
monetdb4-server (4.38.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Mon Jun 28 09:44:16 2010 +0200
@@ -1,6 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org
-- When libxml2 is available, the XML module is automatically loaded.
-
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon Jun 28 09:44:16 2010 +0200
@@ -213,6 +213,12 @@
%{_libdir}/*.so
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100625
+- Rebuilt.
+
+* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100625
+- When libxml2 is available, the XML module is automatically loaded.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100622
- Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Mon Jun 28 06:23:17 2010 +0200
+++ b/MonetDB5/debian/changelog Mon Jun 28 09:44:16 2010 +0200
@@ -1,3 +1,15 @@
+monetdb5-server (5.20.1-20100625) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Fri, 25 Jun 2010 17:41:34 +0200
+
+monetdb5-server (5.20.1-20100625) unstable; urgency=low
+
+ * When libxml2 is available, the XML module is automatically loaded.
+
+ -- Sjoerd Mullender sjo...@acm.org Wed, 23 Jun 2010 17:41:34 +0200
+
monetdb5-server (5.20.1-20100622) unstable; urgency=low
* Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Mon Jun 28 06:23:17 2010 +0200
+++ b/clients/MonetDB-client.spec Mon Jun 28 09:44:16 2010 +0200
@@ -301,6 +301,9 @@
%{_libdir}/MonetDB/Tests/*
%changelog
+* Fri Jun 25 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100625
+- Rebuilt.
+
* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
- Rebuilt.
diff -r 7f53bc7587ca -r 48b4be11fdf3 clients/debian/changelog
--- a/clients/debian/changelog Mon Jun 28 06:23:17 2010 +0200
+++ b/clients/debian/changelog Mon Jun 28 09:44:16 2010 +0200
@@ -1,3 +1,9 @@
MonetDB: default - Merge with Jun2010 branch.
Changeset: 4422020cdd27 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4422020cdd27 Modified Files: pathfinder/benchmarks/MBench/Tests/All pathfinder/benchmarks/XMach-1/Tests/All pathfinder/benchmarks/XMark/XRpc/Tests/All pathfinder/runtime/Tests/All pathfinder/runtime/xrpc/admin/Tests/All pathfinder/tests/BugTracker/Tests/All pathfinder/tests/W3C_use_cases/XQ/PARTS/Tests/All pathfinder/tests/W3C_use_cases/XQ/TREE/Tests/All pathfinder/tests/W3C_use_cases/XQUF/Parts/Tests/All pathfinder/tests/WebSite/Tests/All pathfinder/tests/XQuery/Tests/All pathfinder/tests/XRpc/Tests/All Branch: default Log Message: Merge with Jun2010 branch. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: 6471ec4d124f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6471ec4d124f Modified Files: Branch: default Log Message: Merge from Jun2010 branch. diffs (9 lines): diff -r fd214ada7e0e -r 6471ec4d124f .hgtags --- a/.hgtags Tue Jun 22 18:48:02 2010 +0200 +++ b/.hgtags Wed Jun 23 09:36:20 2010 +0200 @@ -406,3 +406,5 @@ e821c6a9dd33b30ccbb51376b6db7355cf12684e Jun2006_root d3db8bef1dd54bcfb335599338a374b4ca8975fa Jun2010_root 659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 +659965ec908548fa64649bce37f84e245428ce7b Jun2010_1 +d83c56c4bba705257e09846d7f7e23bf5bd96627 Jun2010_1 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: 0797a45f23a5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0797a45f23a5 Modified Files: Branch: default Log Message: Merge from Jun2010 branch. diffs (10 lines): diff -r b2073a1b0b44 -r 0797a45f23a5 MonetDB5/ChangeLog.Jun2010 --- a/MonetDB5/ChangeLog.Jun2010Wed Jun 23 12:33:52 2010 +0200 +++ b/MonetDB5/ChangeLog.Jun2010Wed Jun 23 13:35:38 2010 +0200 @@ -1,3 +1,6 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog +* Wed Jun 23 2010 Sjoerd Mullender sjo...@acm.org +- When libxml2 is available, the XML module is automatically loaded. + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Extend test format...
Changeset: f8988a2c5eb0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8988a2c5eb0
Modified Files:
clients/src/mapiclient/mclient.mx
geom/src/sql/Tests/spatial.stable.out.32bit
Branch: default
Log Message:
Merge from Jun2010 branch: Extend test formatting to geom types.
diffs (truncated from 548 to 300 lines):
diff -r 11d6591fc870 -r f8988a2c5eb0 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Jun 23 14:10:24 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Wed Jun 23 16:41:33 2010 +0200
@@ -855,6 +855,35 @@
case '':
stream_write(toConsole, \\\,
1, 2);
break;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ if (strcmp(tp, curve) == 0 ||
+ strcmp(tp, geometry) == 0
||
+ strcmp(tp, linestring) ==
0 ||
+ strcmp(tp, mbr) == 0 ||
+ strcmp(tp,
multilinestring) == 0 ||
+ strcmp(tp, point) == 0 ||
+ strcmp(tp, polygon) == 0
||
+ strcmp(tp, surface) == 0)
{
+ char *e;
+ double d;
+ d = strtod(s, e);
+ if (s != e) {
+
stream_printf(toConsole, %.10g, d);
+ l -= e - s;
+ s = e;
+ continue;
+ }
+ }
+ /* fall through */
default:
if ((unsigned char) *s ' ')
stream_printf(toConsole,
diff -r 11d6591fc870 -r f8988a2c5eb0 geom/src/sql/Tests/basic.stable.out
--- a/geom/src/sql/Tests/basic.stable.out Wed Jun 23 14:10:24 2010 +0200
+++ b/geom/src/sql/Tests/basic.stable.out Wed Jun 23 16:41:33 2010 +0200
@@ -35,35 +35,35 @@
% g # name
% geometry # type
% 0 # length
-[ POINT (10. 10.)]
-[ LINESTRING (10. 10., 20.
20., 30. 40.) ]
-[ POLYGON ((10. 10., 10.
20., 20. 20.,
20. 15., 10.
10.))]
-[ POLYGON ((10. 10., 10.
20., 20. 20.,
20. 15., 10.
10.), (15. 15.,
15. 20., 10.
15., 15. 15.)) ]
+[ POINT (10 10) ]
+[ LINESTRING (10 10, 20 20, 30 40) ]
+[ POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10)) ]
+[ POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15
15))]
[ NULL ]
% sys.geoms # table_name
% g # name
% geometry # type
% 0 # length
-[ POINT (10. 10.)]
-[ LINESTRING (10. 10., 20.
20., 30. 40.) ]
-[ POLYGON ((10. 10., 10.
20., 20. 20.,
20. 15., 10.
10.))]
-[ POLYGON ((10. 10., 10.
20., 20. 20.,
20. 15., 10.
10.), (15.
MonetDB: default - Merge from Jun2010 branch.
Changeset: da87f97d31f8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da87f97d31f8 Modified Files: Branch: default Log Message: Merge from Jun2010 branch. diffs (23 lines): diff -r f8988a2c5eb0 -r da87f97d31f8 .hgeol --- a/.hgeolWed Jun 23 16:41:33 2010 +0200 +++ b/.hgeolWed Jun 23 17:09:51 2010 +0200 @@ -7,6 +7,7 @@ # various binary files **.bmp = BIN **.bz2 = BIN +**.chm = BIN **.dll = BIN **.gif = BIN **.gz = BIN @@ -16,11 +17,5 @@ **.png = BIN **.zip = BIN -# Windows specific files -**.chm = BIN -**.rtf = CRLF -**.sln = CRLF -**.vdproj = CRLF - # all the rest is text ** = native ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Create monetdb use...
Changeset: dd95b836c486 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd95b836c486 Modified Files: Branch: default Log Message: Merge from Jun2010 branch: Create monetdb user with correct group (monetdb). diffs (24 lines): diff -r 6abda8507eb5 -r dd95b836c486 MonetDB4/debian/monetdb4-server.postinst --- a/MonetDB4/debian/monetdb4-server.postinst Mon Jun 21 23:35:48 2010 +0200 +++ b/MonetDB4/debian/monetdb4-server.postinst Tue Jun 22 11:47:40 2010 +0200 @@ -8,7 +8,7 @@ addgroup --system monetdb fi if ! getent passwd monetdb /dev/null; then -adduser --system --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb +adduser --system --ingroup monetdb --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb fi mkdir -p /var/MonetDB4 chown monetdb:monetdb /var/MonetDB4 diff -r 6abda8507eb5 -r dd95b836c486 MonetDB5/debian/monetdb5-server.postinst --- a/MonetDB5/debian/monetdb5-server.postinst Mon Jun 21 23:35:48 2010 +0200 +++ b/MonetDB5/debian/monetdb5-server.postinst Tue Jun 22 11:47:40 2010 +0200 @@ -8,7 +8,7 @@ addgroup --system monetdb fi if ! getent passwd monetdb /dev/null; then -adduser --system --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb +adduser --system --ingroup monetdb --home /var/lib/monetdb --disabled-password --shell /usr/sbin/nologin monetdb fi mkdir -p /var/MonetDB5 chown monetdb:monetdb /var/MonetDB5 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Preparations for b...
Changeset: 24c4d5e6120d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24c4d5e6120d
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merge from Jun2010 branch: Preparations for building the Jun2010 release.
diffs (truncated from 470 to 300 lines):
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB/MonetDB.spec Tue Jun 22 14:54:19 2010 +0200
@@ -26,7 +26,7 @@
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
URL: http://monetdb.cwi.nl/
-Source: http://downloads.sourceforge.net/monetdb/%{name}-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -106,6 +106,9 @@
%{_libdir}/libbat.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 1.38.1-20100618
- Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB/debian/changelog Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100622) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 22 Jun 2010 14:39:07 +0200
+
monetdb (1.38.1-20100618) unstable; urgency=low
* Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Tue Jun 22 14:54:19 2010 +0200
@@ -26,7 +26,7 @@
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
URL: http://monetdb.cwi.nl/
-Source:
http://downloads.sourceforge.net/monetdb/MonetDB4-server-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB4-server-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
Requires(pre): shadow-utils
@@ -216,6 +216,9 @@
%{_libdir}/libembeddedmil.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 4.38.1-20100618
- Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100622) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 22 Jun 2010 14:39:07 +0200
+
monetdb4-server (4.38.1-20100618) unstable; urgency=low
* Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Tue Jun 22 14:54:19 2010 +0200
@@ -26,7 +26,7 @@
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
URL: http://monetdb.cwi.nl/
-Source:
http://downloads.sourceforge.net/monetdb/MonetDB5-server-%{version}.tar.gz
+Source:
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB5-server-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XX)
%{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}}
@@ -213,6 +213,9 @@
%{_libdir}/*.so
%changelog
+* Tue Jun 22 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100622
+- Rebuilt.
+
* Fri Jun 18 2010 Sjoerd Mullender sjo...@acm.org - 5.20.1-20100618
- Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jun 22 13:28:29 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Jun 22 14:54:19 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5-server (5.20.1-20100622) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender sjo...@acm.org Tue, 22 Jun 2010 14:39:07 +0200
+
monetdb5-server (5.20.1-20100618) unstable; urgency=low
* Rebuilt.
diff -r eeae4a0a1d16 -r 24c4d5e6120d clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Tue Jun 22 13:28:29 2010 +0200
+++ b/clients/MonetDB-client.spec Tue Jun 22 14:54:19 2010 +0200
@@ -26,7 +26,7 @@
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
URL: http://monetdb.cwi.nl/
-Source:
MonetDB: default - Merge from Jun2010 branch.
Changeset: ca5de789af67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca5de789af67
Modified Files:
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge from Jun2010 branch.
diffs (229 lines):
diff -r 20f7b1dd3807 -r ca5de789af67 clients/NT/mclient.bat
--- a/clients/NT/mclient.batThu Jun 17 13:05:14 2010 +0200
+++ b/clients/NT/mclient.batThu Jun 17 13:16:38 2010 +0200
@@ -1,14 +1,20 @@
-...@rem figure out the folder name
-...@set MONETDB=%~dp0
+...@echo off
+rem figure out the folder name
+set MONETDB=%~dp0
-...@rem remove the final backslash from the path
-...@set MONETDB=%MONETDB:~0,-1%
+rem remove the final backslash from the path
+set MONETDB=%MONETDB:~0,-1%
-...@rem extend the search path with our EXE and DLL folders
-...@rem we depend on pthreadVCE.dll having been copied to the lib folder
-...@set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
+rem extend the search path with our EXE and DLL folders
+rem we depend on pthreadVCE.dll having been copied to the lib folder
+set PATH=%MONETDB%\bin;%MONETDB%\lib;%MONETDB%\lib\bin;%PATH%
-...@rem start the real client
-@%MONETDB%\bin\mclient.exe %*
+if %1==/STARTED-FROM-MENU (
+shift
+if %DOTMONETDBFILE%== if exist %MONETDB%\etc\.monetdb set
DOTMONETDBFILE=%MONETDB%\etc\.monetdb
+)
-...@if ERRORLEVEL 1 pause
+rem start the real client
+%MONETDB%\bin\mclient.exe %1 %2 %3 %4 %5 %6 %7 %8
+
+if ERRORLEVEL 1 pause
diff -r 20f7b1dd3807 -r ca5de789af67
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 13:16:38 2010 +0200
@@ -4371,7 +4371,7 @@
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
{
Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --user=monetdb --passwd=monetdb
--encoding=cp437
+Arguments = 8:--language=xquery --encoding=cp437
Description = 8:
ShowCmd = 3:1
IconIndex = 3:0
diff -r 20f7b1dd3807 -r ca5de789af67
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:05:14 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:16:38 2010 +0200
@@ -4339,7 +4339,7 @@
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
{
Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --user=monetdb --passwd=monetdb
--encoding=cp437
+Arguments = 8:--language=xquery --encoding=cp437
Description = 8:
ShowCmd = 3:1
IconIndex = 3:0
diff -r 20f7b1dd3807 -r ca5de789af67 sql/NT/Makefile
--- a/sql/NT/Makefile Thu Jun 17 13:05:14 2010 +0200
+++ b/sql/NT/Makefile Thu Jun 17 13:16:38 2010 +0200
@@ -18,7 +18,7 @@
IBITS = 64
!ENDIF
-all: $(SRCDIR)\Makefile.msc all-msc unistd.h inttypes.h RunMserver.bat
RunMtest.bat RunMapprove.bat
+all: $(SRCDIR)\Makefile.msc all-msc unistd.h inttypes.h RunMserver.bat
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) all
check: $(SRCDIR)\Makefile.msc RunMtest.bat
@@ -28,6 +28,7 @@
install: targetdirs all install-m5installer $(INSTALLER_PREREQ)
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) install
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\MSQLserver.bat
$(prefix)
+ $(INSTALL) .monetdb $(sysconfdir)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix)
-if exist C:\Program Files (x86) if $(bits) == 32
C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/
$(prefix)\$(INSTALLER)$(IBITS).vdproj
@@ -78,6 +79,10 @@
$(ECHO) typedef int int32_t; inttypes.h
$(ECHO) typedef unsigned int uint32_t; inttypes.h
+.monetdb:
+ $(ECHO) user=monetdb .monetdb
+ $(ECHO) password=monetdb .monetdb
+
RunMtest.bat: $(SRCDIR)\RunMtest.bat.in
$(CONFIGURE) $(SRCDIR)\RunMtest.bat.in RunMtest.bat
diff -r 20f7b1dd3807 -r ca5de789af67
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
--- a/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:05:14
2010 +0200
+++ b/sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj Thu Jun 17 13:16:38
2010 +0200
@@ -1269,6 +1269,12 @@
}
Entry
{
+MsmKey = 8:_D301CC5DC1BE412A900D7C90166AC804
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_D5C7D6567FD6463E846405B973A4AD8A
MonetDB: default - Merge from Jun2010 branch.
Changeset: 99d16aff6ce6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99d16aff6ce6
Modified Files:
Branch: default
Log Message:
Merge from Jun2010 branch.
diffs (166 lines):
diff -r 4d32d055c1ea -r 99d16aff6ce6 clients/NT/Makefile
--- a/clients/NT/Makefile Thu Jun 17 13:47:19 2010 +0200
+++ b/clients/NT/Makefile Thu Jun 17 14:39:08 2010 +0200
@@ -19,7 +19,7 @@
IBITS = 64
!ENDIF
-all: $(SRCDIR)\Makefile.msc all-msc $(UNISTD_H) inttypes.h Runmclient.bat
RunMtest.bat RunMapprove.bat
+all: $(SRCDIR)\Makefile.msc all-msc $(UNISTD_H) inttypes.h Runmclient.bat
RunMtest.bat RunMapprove.bat .monetdb
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) all
check: $(SRCDIR)\Makefile.msc
@@ -30,6 +30,7 @@
$(MAKE) /nologo /f $(SRCDIR)\Makefile.msc prefix=$(prefix)
bits=$(bits) install
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\mclient.bat
$(prefix)
if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\msqldump.bat
$(prefix)
+ $(INSTALL) .monetdb $(sysconfdir)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix)
$(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix)
-if exist C:\Program Files (x86) if $(bits) == 32
C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/
$(prefix)\$(INSTALLER)$(IBITS).vdproj
@@ -74,6 +75,10 @@
$(ECHO) typedef int int32_t; inttypes.h
$(ECHO) typedef unsigned int uint32_t; inttypes.h
+.monetdb:
+ $(ECHO) user=monetdb .monetdb
+ $(ECHO) password=monetdb .monetdb
+
Runmclient.bat: $(SRCDIR)\Runmclient.bat.in
$(CONFIGURE) $(SRCDIR)\Runmclient.bat.in Runmclient.bat
diff -r 4d32d055c1ea -r 99d16aff6ce6
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 13:47:19 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdprojThu Jun
17 14:39:08 2010 +0200
@@ -813,6 +813,12 @@
}
Entry
{
+MsmKey = 8:_E37FEE23A93548469BB7560D5524BD93
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_E4A29EC2213B4C99B49B7AC34E99F880
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -3654,6 +3660,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E37FEE23A93548469BB7560D5524BD93
+{
+SourcePath = 8:etc\\.monetdb
+TargetName = 8:.monetdb
+Tag = 8:
+Folder = 8:_B5DFB5D13EE441F8B42616036AACB603
+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}:_E4A29EC2213B4C99B49B7AC34E99F880
{
SourcePath = 8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll
@@ -4371,7 +4397,7 @@
{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FADEF69B58784586806CF8E1826524B3
{
Name = 8:MonetDB XQuery Client
-Arguments = 8:--language=xquery --encoding=cp437
+Arguments = 8:/STARTED-FROM-MENU --language=xquery
--encoding=cp437
Description = 8:
ShowCmd = 3:1
IconIndex = 3:0
diff -r 4d32d055c1ea -r 99d16aff6ce6
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 13:47:19 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj Thu Jun
17 14:39:08 2010 +0200
@@ -51,6 +51,12 @@
}
Entry
{
+MsmKey = 8:_0EF9137A18874950B2B979E4A3D14364
+OwnerKey = 8:_UNDEFINED
+MsmSig = 8:_UNDEFINED
+}
+Entry
+{
MsmKey = 8:_0F0962C21371457C8ABE0A563FC8A41A
OwnerKey = 8:_UNDEFINED
MsmSig = 8:_UNDEFINED
@@ -1122,6 +1128,26 @@
IsDependency = 11:FALSE
IsolateTo = 8:
}
+
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0EF9137A18874950B2B979E4A3D14364
+{
+SourcePath = 8:etc\\.monetdb
+TargetName = 8:.monetdb
+Tag = 8:
+Folder = 8:_B5DFB5D13EE441F8B42616036AACB603
+Condition = 8:
+Transitive = 11:FALSE
+Vital = 11:TRUE
+ReadOnly = 11:FALSE
+Hidden = 11:FALSE
+System = 11:FALSE
+Permanent = 11:FALSE
+SharedLegacy = 11:FALSE
+
MonetDB: default - Merge from Jun2010 branch.
Changeset: 3920853fb751 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3920853fb751 Modified Files: Branch: default Log Message: Merge from Jun2010 branch. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: b6ced64542c1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6ced64542c1 Modified Files: Branch: default Log Message: Merge from Jun2010 branch. diffs (11 lines): diff -r 3920853fb751 -r b6ced64542c1 pathfinder/NT/Makefile --- a/pathfinder/NT/MakefileTue Jun 15 15:31:38 2010 +0200 +++ b/pathfinder/NT/MakefileTue Jun 15 16:19:33 2010 +0200 @@ -44,6 +44,7 @@ if not $(MAKEDIR) == $(prefix) $(INSTALL) ..\NT\pf.bat $(prefix) $(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).sln $(prefix) $(INSTALL) ..\NT\$(INSTALLER)\$(INSTALLER)$(IBITS).vdproj $(prefix) + -if $(bits)==32 if exist C:\Program Files (x86) C:\cygwin\bin\sed.exe -i s/Program Files/Program Files (x86)/ $(prefix)\$(INSTALLER)$(IBITS).vdproj -devenv $(prefix)\$(INSTALLER)$(IBITS).sln /build if exist $(prefix)\$(INSTALLER)$(IBITS).msi del /f $(prefix)\$(INSTALLER)$(IBITS).msi if exist $(prefix)\Debug\$(INSTALLER)$(IBITS).msi $(INSTALL) /Y $(prefix)\Debug\$(INSTALLER)$(IBITS).msi $(prefix) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch.
Changeset: c82ff214897c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c82ff214897c Modified Files: Branch: default Log Message: Merge from Jun2010 branch. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Ignore backup files.
Changeset: f0c052d55106 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0c052d55106 Modified Files: .hgignore Branch: default Log Message: Merge from Jun2010 branch: Ignore backup files. diffs (11 lines): diff -r 42775467d209 -r f0c052d55106 .hgignore --- a/.hgignore Wed Jun 02 11:52:46 2010 +0200 +++ b/.hgignore Wed Jun 02 12:52:11 2010 +0200 @@ -1,6 +1,7 @@ /\# /\.\# /@ +~$ MANIFEST$ Makefile\.in$ MonetDB4/NT/MonetDB\.pc$ ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge from Jun2010 branch: Fix reference in a...
Changeset: 7d70539ee951 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d70539ee951 Modified Files: Branch: default Log Message: Merge from Jun2010 branch: Fix reference in array module. diffs (12 lines): diff -r d3570bb29148 -r 7d70539ee951 MonetDB5/src/modules/kernel/array.mx --- a/MonetDB5/src/modules/kernel/array.mx Tue Jun 01 14:23:49 2010 +0200 +++ b/MonetDB5/src/modules/kernel/array.mx Tue Jun 01 16:37:36 2010 +0200 @@ -46,7 +46,7 @@ comment Fills an index BAT, (grpcount,grpsize,clustersize,offset); command grid(b:bat[:oid,:@1],i:@1,j:@1,k:@1,l:@1,s:@1) :bat[:oid,:@1] -address arraygridb...@1 +address arraygridbatshi...@1 comment Fills an index BAT, (grpcount,grpsize,clustersize,offset) and shift all elemenets with a factor s; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
