Changeset: 6b88bbb8c524 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b88bbb8c524
Modified Files:
        MonetDB.spec
        configure.ag
Branch: default
Log Message:

Merge with Apr2011 branch.


diffs (truncated from 387 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -438,3 +438,4 @@
 8a1a1b65992cd98423eee70cef0986beb3b7360d Apr2011_root
 e4e992bb9279acc293403527538d9909f46f2325 Mar2011_1
 be8ff3e8c6150ec40f4e0d1ba9789bec23621f88 Mar2011_1
+568733c4fc9fc0275d4b264fa188df6c70ede9cf Apr2011_1
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,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/Mar2011/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Apr2011/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -574,6 +574,62 @@
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Thu Apr 14 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.1-20110414
+- Rebuilt.
+
+* Thu Apr 14 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.1-20110414
+- gdk: Fixed bugs in antiselect which gave the incorrect result when upper
+  and lower bount were equal.  This bug could be triggered by the SQL
+  query SELECT * FROM t WHERE x NOT BETWEEN y AND y.
+
+* Thu Apr 14 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.1-20110414
+- sql: Some names in the SQL catalog were changed.  This means that the
+  database in the Apr2011 release is not compatible with pre-Apr2011
+  databases.  The database is converted automatically when opened the
+  first time.  This database can then no longer be read by an older
+  release.
+
+* Tue Apr  5 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- clients: Plugged a small memory leak occurring upon redirects by the server
+  (e.g. via monetdbd)
+
+* Tue Apr  5 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- java: clarify exception messages for unsupported methods
+
+* Thu Mar 24 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- merovingian: The forward property for databases has been removed.  Instead, 
only
+  a global proxy or redirect mode can be set using monetdbd.
+
+* Thu Mar 24 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- merovingian: monetdbd can no longer log error and normal messages to separate
+  logfiles, logging to stdout and stderr is no longer possible either.
+- merovingian: The .merovingian_pass file is no longer in use, and replaced by 
the
+  .merovingian_properties file.  Use monetdbd (get|set) passphrase to
+  view/edit the control passphrase.  Existing .merovingian_pass files
+  will automatically be migrated upon startup of monetdbd.
+- merovingian: monetdbd now understands commands that allow to create, start, 
stop,
+  get and set properties on a given dbfarm.  This behaviour is intended
+  as primary way to start a MonetDB Database Server, on a given location
+  of choice.  monetdbd get and set are the replacement of editing the
+  monetdb5.conf file (which is no longer in use as of the Apr2011
+  release).  See monetdbd(1).
+
+* Thu Mar 24 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- clients: Remove XQuery related code from Ruby adapter, PHP driver and Perl 
Mapi
+  library
+
+* Thu Mar 24 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- java: Removed XQuery related XRPC wrapper and XML:DB code, removed support
+  for language=xquery and language=mil from JDBC.
+
+* Thu Mar 24 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- clients: Make SQL the default language for mclient, e.g. to use when 
--language=
+  or -l is omitted
+
+* Thu Mar 24 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- monetdb5: mserver5 no longer reads monetdb5.conf upon startup by default.
+  Use --config=file to have mserver5 read a configuration on startup
+
 * Thu Mar 24 2011 Sjoerd Mullender <sjo...@acm.org> - 11.1.1-20110324
 - Rebuilt.
 
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,18 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Apr  5 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- Plugged a small memory leak occurring upon redirects by the server
+  (e.g. via monetdbd)
+
+* Mon Feb  7 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- Remove XQuery related code from Ruby adapter, PHP driver and Perl Mapi
+  library
+
+* Thu Feb  3 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- Make SQL the default language for mclient, e.g. to use when --language=
+  or -l is omitted
+
 * Mon Feb 14 2011 Sjoerd Mullender <sjo...@acm.org> - 11.1.1-20110317
 - Fixed bug 2677: SQL_DESC_OCTET_LENGTH should give the size in bytes
   required to copy the data.
diff --git a/clients/ChangeLog.Apr2011 b/clients/ChangeLog.Apr2011
--- a/clients/ChangeLog.Apr2011
+++ b/clients/ChangeLog.Apr2011
@@ -1,15 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Tue Apr  5 2011 Fabian Groffen <fab...@cwi.nl>
-- Plugged a small memory leak occurring upon redirects by the server
-  (e.g. via monetdbd)
-
-* Mon Feb  7 2011 Fabian Groffen <fab...@cwi.nl>
-- Remove XQuery related code from Ruby adapter, PHP driver and Perl Mapi
-  library
-
-* Thu Feb  3 2011 Fabian Groffen <fab...@cwi.nl>
-- Make SQL the default language for mclient, e.g. to use when --language=
-  or -l is omitted
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,92 @@
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 14 Apr 2011 10:11:08 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * gdk: Fixed bugs in antiselect which gave the incorrect result when upper
+    and lower bount were equal.  This bug could be triggered by the SQL
+    query SELECT * FROM t WHERE x NOT BETWEEN y AND y.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 14 Apr 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * sql: Some names in the SQL catalog were changed.  This means that the
+    database in the Apr2011 release is not compatible with pre-Apr2011
+    databases.  The database is converted automatically when opened the
+    first time.  This database can then no longer be read by an older
+    release.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 14 Apr 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * clients: Plugged a small memory leak occurring upon redirects by the server
+    (e.g. via monetdbd)
+
+ -- Fabian Groffen <fab...@cwi.nl>  Tue, 5 Apr 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * java: clarify exception messages for unsupported methods
+
+ -- Fabian Groffen <fab...@cwi.nl>  Tue, 5 Apr 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * merovingian: The forward property for databases has been removed.  
Instead, only
+    a global proxy or redirect mode can be set using monetdbd.
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 24 Mar 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * merovingian: monetdbd can no longer log error and normal messages to 
separate
+    logfiles, logging to stdout and stderr is no longer possible either.
+  * merovingian: The .merovingian_pass file is no longer in use, and replaced 
by the
+    .merovingian_properties file.  Use monetdbd (get|set) passphrase to
+    view/edit the control passphrase.  Existing .merovingian_pass files
+    will automatically be migrated upon startup of monetdbd.
+  * merovingian: monetdbd now understands commands that allow to create, 
start, stop,
+    get and set properties on a given dbfarm.  This behaviour is intended
+    as primary way to start a MonetDB Database Server, on a given location
+    of choice.  monetdbd get and set are the replacement of editing the
+    monetdb5.conf file (which is no longer in use as of the Apr2011
+    release).  See monetdbd(1).
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 24 Mar 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * clients: Remove XQuery related code from Ruby adapter, PHP driver and Perl 
Mapi
+    library
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 24 Mar 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * java: Removed XQuery related XRPC wrapper and XML:DB code, removed support
+    for language=xquery and language=mil from JDBC.
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 24 Mar 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * clients: Make SQL the default language for mclient, e.g. to use when 
--language=
+    or -l is omitted
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 24 Mar 2011 10:11:07 +0200
+
+monetdb (11.3.1-20110414) unstable; urgency=low
+
+  * monetdb5: mserver5 no longer reads monetdb5.conf upon startup by default.
+    Use --config=file to have mserver5 read a configuration on startup
+
+ -- Fabian Groffen <fab...@cwi.nl>  Thu, 24 Mar 2011 10:11:07 +0200
+
 monetdb (11.1.1-20110324) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Apr 14 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.1-20110414
+- Fixed bugs in antiselect which gave the incorrect result when upper
+  and lower bount were equal.  This bug could be triggered by the SQL
+  query SELECT * FROM t WHERE x NOT BETWEEN y AND y.
+
 * Tue Mar 22 2011 Fabian Groffen <fab...@cwi.nl> - 11.1.1-20110324
 - Fixed memory detection on Darwin (Mac OS X) systems not to return
   bogus values
diff --git a/gdk/ChangeLog.Apr2011 b/gdk/ChangeLog.Apr2011
--- a/gdk/ChangeLog.Apr2011
+++ b/gdk/ChangeLog.Apr2011
@@ -1,8 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Thu Apr 14 2011 Sjoerd Mullender <sjo...@acm.org>
-- Fixed bugs in antiselect which gave the incorrect result when upper
-  and lower bount were equal.  This bug could be triggered by the SQL
-  query SELECT * FROM t WHERE x NOT BETWEEN y AND y.
-
diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive
--- a/java/ChangeLog-Archive
+++ b/java/ChangeLog-Archive
@@ -1,6 +1,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Apr  5 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- clarify exception messages for unsupported methods
+
+* Mon Feb  7 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- Removed XQuery related XRPC wrapper and XML:DB code, removed support
+  for language=xquery and language=mil from JDBC.
+
 * Wed Dec 15 2010 Fabian Groffen <fab...@cwi.nl> - 11.1.1-20110317
 - PreparedStatements now free the server-side resources attached to them
   when closed.  This implements bug #2720
diff --git a/java/ChangeLog.Apr2011 b/java/ChangeLog.Apr2011
--- a/java/ChangeLog.Apr2011
+++ b/java/ChangeLog.Apr2011
@@ -1,10 +1,3 @@
 # ChangeLog file for java
 # This file is updated with Maddlog
 
-* Tue Apr  5 2011 Fabian Groffen <fab...@cwi.nl>
-- clarify exception messages for unsupported methods
-
-* Mon Feb  7 2011 Fabian Groffen <fab...@cwi.nl>
-- Removed XQuery related XRPC wrapper and XML:DB code, removed support
-  for language=xquery and language=mil from JDBC.
-
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,10 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Feb  3 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
+- mserver5 no longer reads monetdb5.conf upon startup by default.
+  Use --config=file to have mserver5 read a configuration on startup
+
 * Sat Mar 05 2011 Stefan de Konink <ste...@konink.de> - 11.1.1-20110317
 - sphinx module: update, adding limit/max_results support
 
diff --git a/monetdb5/ChangeLog.Apr2011 b/monetdb5/ChangeLog.Apr2011
--- a/monetdb5/ChangeLog.Apr2011
+++ b/monetdb5/ChangeLog.Apr2011
@@ -1,7 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Thu Feb  3 2011 Fabian Groffen <fab...@cwi.nl>
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to