date:20100622

MonetDB: default - merge with Jun2010

2010-06-22 Thread Stefan Manegold

Changeset: fd214ada7e0e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd214ada7e0e
Modified Files:

sql/src/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
Branch: default
Log Message:

merge with Jun2010

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - approved new output also in the Jun2010 branch

2010-06-22 Thread Stefan Manegold

Changeset: 90f0410e1611 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90f0410e1611
Modified Files:

sql/src/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
Branch: Jun2010
Log Message:

approved new output also in the Jun2010 branch
(Niels already did so earlier in the default trunk)


diffs (32 lines):

diff -r a75205484055 -r 90f0410e1611 
sql/src/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
--- 
a/sql/src/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out   
Tue Jun 22 18:43:57 2010 +0200
+++ 
b/sql/src/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out   
Tue Jun 22 18:45:20 2010 +0200
@@ -20,17 +20,17 @@
 
 Over..
 
-# 19:24:24 >  
-# 19:24:24 >  /ufs/fabian/scratch/programs/gentoo/usr/bin/python 
crash_on_concurrent_use.SF-1411926.SQL.py crash_on_concurrent_use.SF-1411926 
-# 19:24:24 >  
+# 18:41:25 >  
+# 18:41:25 >  /usr/bin/python crash_on_concurrent_use.SF-1411926.SQL.py 
crash_on_concurrent_use.SF-1411926 
+# 18:41:25 >  
 
-(0, [(26,), (1,)])
-(1, [(26,), (1,)])
-(2, [(26,), (1,)])
-(3, [(26,), (1,)])
-(4, [(26,), (1,)])
+(0, [(26,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(1, [(26,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(2, [(26,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(3, [(26,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(4, [(26,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
 
-# 19:24:25 >  
-# 19:24:25 >  Done.
-# 19:24:25 >  
+# 18:41:25 >  
+# 18:41:25 >  Done.
+# 18:41:25 >  
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - Fixed test script

2010-06-22 Thread Stefan Manegold

Changeset: a75205484055 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a75205484055
Modified Files:
clients/src/python/test/dbapi20.py
Branch: Jun2010
Log Message:

Fixed test script
to make test sql/src/test/mapi/python_test_monetdb_sql_dbapi20.*
work, again.
Thanks go to Gijs Molenaar for suggesting the fix.


diffs (11 lines):

diff -r a3e55ee55c4c -r a75205484055 clients/src/python/test/dbapi20.py
--- a/clients/src/python/test/dbapi20.pyTue Jun 22 17:24:55 2010 +0200
+++ b/clients/src/python/test/dbapi20.pyTue Jun 22 18:43:57 2010 +0200
@@ -582,6 +582,7 @@
 cur.execute(sql)
 
 cur.execute('select name from %sbooze' % self.table_prefix)
+cur.arraysize=1
 r = cur.fetchmany()
 self.assertEqual(len(r),1,
 'cursor.fetchmany retrieved incorrect number of rows, '
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge with Jun2010

2010-06-22 Thread Stefan Manegold

Changeset: ec7cfdd4bf3c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec7cfdd4bf3c
Modified Files:
sql/src/test/leaks/Tests/bbp.sql
Branch: default
Log Message:

merge with Jun2010

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - made "leaks" tests work, again in the Jun2010...

2010-06-22 Thread Stefan Manegold

Changeset: a3e55ee55c4c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3e55ee55c4c
Modified Files:
sql/src/test/leaks/Tests/bbp.sql
sql/src/test/leaks/Tests/bbp.sql.src
Branch: Jun2010
Log Message:

made "leaks" tests work, again in the Jun2010 branch

Prior to recent "autoload" and sql initialization changes,
the used to be a sql/src/sql/admin.sql script that provided
some function (mainly/only?) for the "leaks" tests.
The first "leaks" test, "bbb.sql" use to source this script.
With the recent changes, the admin.sql script was removed
from both the Jun2010 branch and the default.
While some more changes in the default seems to make the
leaks tests work, again, they fail in the Jun2010 branch
as the bbp() (formerly defined in admin.sql) is not available.

This checkin makes the leaks tests work, again, by restoring
the former "admin.sql" script only locally as "bbp.sql" for
the leaks tests.

This checkin will not be propagated to the default.


diffs (42 lines):

diff -r 776189c3f868 -r a3e55ee55c4c sql/src/test/leaks/Tests/bbp.sql
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/leaks/Tests/bbp.sql  Tue Jun 22 17:24:55 2010 +0200
@@ -0,0 +1,33 @@
+-- The contents of this file are subject to the MonetDB Public License
+-- Version 1.1 (the "License"); you may not use this file except in
+-- compliance with the License. You may obtain a copy of the License at
+-- http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+--
+-- Software distributed under the License is distributed on an "AS IS"
+-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+-- License for the specific language governing rights and limitations
+-- under the License.
+--
+-- The Original Code is the MonetDB Database System.
+--
+-- The Initial Developer of the Original Code is CWI.
+-- Copyright August 2008-2010 MonetDB B.V.
+-- All Rights Reserved.
+
+-- The MonetDB kernel environment table
+create function environment()
+   returns table (nme string, val string)
+   external name sql.environment;
+
+-- The BAT buffer pool overview
+create function bbp () 
+   returns table (id int, name string, htype string, 
+   ttype string, count BIGINT, refcnt int, lrefcnt int, 
+   location string, heat int, dirty string, 
+   status string, kind string) 
+   external name sql.bbp;
+
+-- Change the whereabouts of the log file
+create procedure logfile(filename string) 
+   external name sql.logfile;
+
diff -r 776189c3f868 -r a3e55ee55c4c sql/src/test/leaks/Tests/bbp.sql.src
--- a/sql/src/test/leaks/Tests/bbp.sql.src  Tue Jun 22 16:30:14 2010 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,1 +0,0 @@
-$RELSRCDIR/../../../sql/admin.sql
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Fix warning emitted by pkg-config by first ch...

2010-06-22 Thread Fabian Groffen

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

Fix warning emitted by pkg-config by first checking if the cfitsio package is 
installed at all.

This closes bug #2562.

I cannot login to bugzilla right now, hence I cannot close the bug.


diffs (16 lines):

diff -r d0bbb49dae09 -r 30b07534802e MonetDB5/configure.ag
--- a/MonetDB5/configure.ag Tue Jun 22 16:31:48 2010 +0200
+++ b/MonetDB5/configure.ag Tue Jun 22 16:35:02 2010 +0200
@@ -332,8 +332,10 @@
 AC_PATH_PROG(CFITSIO_CONFIG,pkg-config,,$XPATH)
 
 if test "x$CFITSIO_CONFIG" != x; then
-CFITSIO_CFLAGS="`$CFITSIO_CONFIG cfitsio --cflags`"
-CFITSIO_LIBS="`$CFITSIO_CONFIG cfitsio --libs`"
+   if `$CFITSIO_CONFIG --exists cfitsio` ; then
+   CFITSIO_CFLAGS="`$CFITSIO_CONFIG cfitsio --cflags`"
+   CFITSIO_LIBS="`$CFITSIO_CONFIG cfitsio --libs`"
+   fi
 else
case "$have_cfitsio" in
auto|yes)
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge with Jun2010: approved new error message

2010-06-22 Thread Stefan Manegold

Changeset: d0bbb49dae09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0bbb49dae09
Modified Files:

Branch: default
Log Message:

merge with Jun2010: approved new error message
assuming that the change from
"!MALException:mal.interpreter:Recursive call limit reached."
to
"!MALException:mal.interpreter:Running out of stack space."
was indeed intended ...


diffs (12 lines):

diff -r 85fb798ea5b7 -r d0bbb49dae09 MonetDB5/src/mal/Tests/pithole.stable.out
--- a/MonetDB5/src/mal/Tests/pithole.stable.out Tue Jun 22 15:28:20 2010 +0200
+++ b/MonetDB5/src/mal/Tests/pithole.stable.out Tue Jun 22 16:31:48 2010 +0200
@@ -16,7 +16,7 @@
 #challenge the runtime stack protection 
 user.main();
 end main;
-!MALException:mal.interpreter:Recursive call limit reached.
+!MALException:mal.interpreter:Running out of stack space.
 
 # 14:45:52 >  
 # 14:45:52 >  Done.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - approved new error message

2010-06-22 Thread Stefan Manegold

Changeset: 776189c3f868 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=776189c3f868
Modified Files:
MonetDB5/src/mal/Tests/pithole.stable.out
Branch: Jun2010
Log Message:

approved new error message
assuming that the change from
"!MALException:mal.interpreter:Recursive call limit reached."
to
"!MALException:mal.interpreter:Running out of stack space."
was indeed intended ...


diffs (12 lines):

diff -r 600a35cbf6c0 -r 776189c3f868 MonetDB5/src/mal/Tests/pithole.stable.out
--- a/MonetDB5/src/mal/Tests/pithole.stable.out Mon Jun 21 23:35:09 2010 +0200
+++ b/MonetDB5/src/mal/Tests/pithole.stable.out Tue Jun 22 16:30:14 2010 +0200
@@ -16,7 +16,7 @@
 #challenge the runtime stack protection 
 user.main();
 end main;
-!MALException:mal.interpreter:Recursive call limit reached.
+!MALException:mal.interpreter:Running out of stack space.
 
 # 14:45:52 >  
 # 14:45:52 >  Done.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Pseudo merge from Jun2010

2010-06-22 Thread Fabian Groffen

Changeset: 85fb798ea5b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85fb798ea5b7
Modified Files:
sql/src/server/rel_bin.mx
sql/src/server/rel_schema.mx
sql/src/server/rel_select.mx
sql/src/server/sql_parser.mx
sql/src/server/sql_statement.mx
sql/src/test/Dependencies/Tests/Dependencies.stable.out
Branch: default
Log Message:

Pseudo merge from Jun2010

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - make it possible to use '?' in offset and limit

2010-06-22 Thread Niels Nes

Changeset: 600a35cbf6c0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=600a35cbf6c0
Modified Files:
sql/src/server/bin_optimizer.mx
sql/src/server/rel_bin.mx
sql/src/server/rel_schema.mx
sql/src/server/rel_select.mx
sql/src/server/sql_parser.mx
sql/src/server/sql_statement.mx
sql/src/server/sql_symbol.mx
sql/src/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/src/test/Dependencies/Tests/Dependencies.stable.out
Branch: Jun2010
Log Message:

make it possible to use '?' in offset and limit
(transplanted from 61c37c0d76f8ee3359bda98cc25e750b5201ae56)


diffs (truncated from 482 to 300 lines):

diff -r d83c56c4bba7 -r 600a35cbf6c0 sql/src/server/bin_optimizer.mx
--- a/sql/src/server/bin_optimizer.mx   Tue Jun 22 14:39:09 2010 +0200
+++ b/sql/src/server/bin_optimizer.mx   Mon Jun 21 23:35:09 2010 +0200
@@ -288,9 +288,9 @@
stmt *r = stmt_dup(j->op2.stval);
 
l = stmt_limit(l, 
- s->op2.stval->op1.aval->data.val.wval,
- s->op3.stval->op1.aval->data.val.wval,
- s->flag);
+   stmt_dup(s->op2.stval),
+   stmt_dup(s->op3.stval),
+   s->flag);
s = stmt_join(l, r, cmp_equal); 
ns = bin_optimizer(c, s);
stmt_destroy(s);
@@ -311,9 +311,9 @@
stmt *r = stmt_dup(j->op2.stval);
 
r = stmt_limit(r, 
- s->op2.stval->op1.aval->data.val.wval,
- s->op3.stval->op1.aval->data.val.wval,
- s->flag);
+   stmt_dup(s->op2.stval),
+   stmt_dup(s->op3.stval),
+   s->flag);
s = stmt_join(l, r, cmp_equal); 
ns = bin_optimizer(c, s);
stmt_destroy(s);
@@ -325,8 +325,8 @@
/* try to push the limit through the order */
if (j->type == st_order) {
s = stmt_order(stmt_limit(stmt_dup(j->op1.stval),
-   s->op2.stval->op1.aval->data.val.wval,
-   s->op3.stval->op1.aval->data.val.wval,
+   stmt_dup(s->op2.stval),
+   stmt_dup(s->op3.stval),
LIMIT_DIRECTION(j->flag,1,0)), j->flag);
ns = bin_optimizer(c, s);
stmt_destroy(s);
@@ -338,8 +338,8 @@
/* try to push the limit through the reverse */
if (!s->flag && j->type == st_reverse) {
s = stmt_reverse(stmt_limit(stmt_dup(j->op1.stval),
-   s->op2.stval->op1.aval->data.val.wval,
-   s->op3.stval->op1.aval->data.val.wval,
+   stmt_dup(s->op2.stval),
+   stmt_dup(s->op3.stval),
0));
ns = bin_optimizer(c, s);
stmt_destroy(s);
@@ -351,8 +351,9 @@
/* try to push the limit through the mark (only if there is no 
offset) */
if (!s->op2.stval->op1.aval->data.val.wval && j->type == 
st_mark) {
s = stmt_mark_tail(stmt_limit(stmt_dup(j->op1.stval),
-   s->op2.stval->op1.aval->data.val.wval,
-   s->op3.stval->op1.aval->data.val.wval, s->flag),
+   stmt_dup(s->op2.stval),
+   stmt_dup(s->op3.stval),
+   s->flag),
j->op2.stval->op1.aval->data.val.ival);
ns = bin_optimizer(c, s);
stmt_destroy(s);
diff -r d83c56c4bba7 -r 600a35cbf6c0 sql/src/server/rel_bin.mx
--- a/sql/src/server/rel_bin.mx Tue Jun 22 14:39:09 2010 +0200
+++ b/sql/src/server/rel_bin.mx Mon Jun 21 23:35:09 2010 +0200
@@ -1478,32 +1478,26 @@
return stmt_list(l);
 }
 
-static wrd
+static sql_exp*
 topn_limit( sql_rel *rel )
 {
if (rel->exps) {
sql_exp *limit = rel->exps->h->data;
-   atom *a = limit->l;
-
-   return a->data.val.wval;
+
+   return limit;
}
-   return -1;
+   return NULL;
 }
 
-static wrd
+static sql_exp*
 topn_offset( sql_rel *rel )
 {
-   wrd o = 0;
-
if (rel->exps && list_length(rel->exps) > 1) {
sql_exp *offset = rel->exps->h->next->data;
-   atom *a = offset->l;
-
-   o = a->data.val.wval;
-   if (o <= 0)
-   o = 0;
+
+   return off

MonetDB: default - Merge from Jun2010 branch: Preparations for b...

2010-06-22 Thread Sjoerd Mullender

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  - 1.38.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender  - 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   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  - 4.38.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender  - 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   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  - 5.20.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender  - 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   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: 
http://downloads.sourceforge.net/monetdb/MonetDB-client-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010/MonetDB-client-%{version}.tar.gz
 BuildRoot: %(mktemp

MonetDB: Jun2010 - Preparations for building the Jun2010 release.

2010-06-22 Thread Sjoerd Mullender

Changeset: d83c56c4bba7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d83c56c4bba7
Modified Files:
MonetDB/MonetDB.spec
MonetDB/debian/changelog
MonetDB4/MonetDB-server.spec
MonetDB4/debian/changelog
MonetDB5/MonetDB-server.spec
MonetDB5/debian/changelog
clients/MonetDB-client.spec
clients/debian/changelog

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
geom/debian/changelog
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
pathfinder/debian/changelog
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/debian/changelog
testing/MonetDB-testing.spec
testing/debian/changelog
Branch: Jun2010
Log Message:

Preparations for building the Jun2010 release.

Moved contents of ChangeLog.Jun2010 to .spec file and debian/changelog.


diffs (truncated from 470 to 300 lines):

diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec  Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB/MonetDB.spec  Tue Jun 22 14:39:09 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  - 1.38.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender  - 1.38.1-20100618
 - Rebuilt.
 
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB/debian/changelog  Tue Jun 22 14:39:09 2010 +0200
@@ -1,3 +1,9 @@
+monetdb (1.38.1-20100622) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender   Tue, 22 Jun 2010 14:39:07 +0200
+
 monetdb (1.38.1-20100618) unstable; urgency=low
 
   * Rebuilt.
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec  Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec  Tue Jun 22 14:39:09 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  - 4.38.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender  - 4.38.1-20100618
 - Rebuilt.
 
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB4/debian/changelog Tue Jun 22 14:39:09 2010 +0200
@@ -1,3 +1,9 @@
+monetdb4-server (4.38.1-20100622) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender   Tue, 22 Jun 2010 14:39:07 +0200
+
 monetdb4-server (4.38.1-20100618) unstable; urgency=low
 
   * Rebuilt.
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec  Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec  Tue Jun 22 14:39:09 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  - 5.20.1-20100622
+- Rebuilt.
+
 * Fri Jun 18 2010 Sjoerd Mullender  - 5.20.1-20100618
 - Rebuilt.
 
diff -r 5d49a55cca03 -r d83c56c4bba7 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Tue Jun 22 13:27:59 2010 +0200
+++ b/MonetDB5/debian/changelog Tue Jun 22 14:39:09 2010 +0200
@@ -1,3 +1,9 @@
+monetdb5

MonetDB: default - Merge backport.

2010-06-22 Thread Sjoerd Mullender

Changeset: eeae4a0a1d16 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eeae4a0a1d16
Modified Files:
sql/debian/monetdb5-sql.default
sql/debian/monetdb5-sql.init.d
Branch: default
Log Message:

Merge backport.

___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - Backported all debian packaging fixes from de...

2010-06-22 Thread Sjoerd Mullender

Changeset: 5d49a55cca03 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d49a55cca03
Modified Files:
sql/debian/monetdb5-sql.default
sql/debian/monetdb5-sql.init.d
Branch: Jun2010
Log Message:

Backported all debian packaging fixes from default to Jun2010.


diffs (203 lines):

diff -r dc19c5e2ef94 -r 5d49a55cca03 sql/debian/monetdb5-sql.default
--- a/sql/debian/monetdb5-sql.default   Tue Jun 22 13:04:17 2010 +0200
+++ b/sql/debian/monetdb5-sql.default   Tue Jun 22 13:27:59 2010 +0200
@@ -2,10 +2,8 @@
 # sourced by /etc/init.d/monetdb5-sql
 # installed at /etc/default/monetdb5-sql by the maintainer scripts
 
-#
-# This is a POSIX shell fragment
-#
+# should merovingian be started at system startup (yes/no)
+STARTUP="no"
 
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""
-STARTUP="no"
+# should all databases be started (yes/no)
+START_ALL_DBS="no"
diff -r dc19c5e2ef94 -r 5d49a55cca03 sql/debian/monetdb5-sql.init.d
--- a/sql/debian/monetdb5-sql.init.dTue Jun 22 13:04:17 2010 +0200
+++ b/sql/debian/monetdb5-sql.init.dTue Jun 22 13:27:59 2010 +0200
@@ -11,25 +11,33 @@
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DAEMON=/usr/bin/merovingian
-NAME=mserver5-sql
+NAME=merovingian
 DESC="MonetDB SQL server"
 
 test -x $DAEMON || exit 0
 
+umask 022
+
 LOGDIR=/var/log/MonetDB
-PIDFILE=/var/run/MonetDB/merovingian.pid
-DODTIME=1   # Time to wait for the server to die, in seconds
-# If this value is set too low you might not
-# let some servers to die gracefully and
-# 'restart' will not work
+PIDFILE=/var/run/MonetDB/$NAME.pid
 
-# Include mserver5-sql defaults if available
-if [ -f /etc/default/$NAME ] ; then
-. /etc/default/$NAME
+# Include monetdb5-sql defaults if available
+if [ -f /etc/default/monetdb5-sql ] ; then
+. /etc/default/monetdb5-sql
 fi
 
-running_pid()
-{
+set -e
+
+init() {
+if [ ! -d /var/run/MonetDB ]; then
+mkdir /var/run/MonetDB
+fi
+chown -R monetdb.monetdb /var/run/MonetDB
+chmod 775 /var/run/MonetDB
+rm -f /var/run/MonetDB/*
+}
+
+running_pid() {
 # Check if a given process pid's cmdline matches a given name
 pid=$1
 name=$2
@@ -41,12 +49,7 @@
 return 0
 }
 
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
-# No pidfile, probably no daemon present
+running() {
 [ ! -f "$PIDFILE" ] && return 1
 # Obtain the pid and check it against the binary name
 pid=`cat $PIDFILE`
@@ -54,84 +57,46 @@
 return 0
 }
 
-force_stop() {
-# Forcefully kill the process
-[ ! -f "$PIDFILE" ] && return
-if running ; then
-kill -15 $pid
-# Is it really dead?
-[ -n "$DODTIME" ] && sleep "$DODTIME"s
-if running ; then
-kill -9 $pid
-[ -n "$DODTIME" ] && sleep "$DODTIME"s
-if running ; then
-echo "Cannot kill $NAME (pid=$pid)!"
-exit 1
-fi
-fi
-fi
-rm -f $PIDFILE
-return 0
-}
-
 case "$1" in
   start)
+if [ "$STARTUP" != "yes" ]; then
+echo "can't start, should be enabled first by change STARTUP to 
yes in /etc/default/monetdb5-sql"
+exit 1
+fi
+
+if running; then
+echo "$NAME is already running"
+exit 1
+fi
+
+init
+
 echo -n "Starting $DESC: "
-start-stop-daemon --start --quiet --pidfile $PIDFILE \
---exec $DAEMON -- $DAEMON_OPTS
+start-stop-daemon --start --exec $DAEMON -c monetdb:monetdb -- 
$DAEMON_OPTS
 if running ; then
 echo "$NAME."
 else
-echo " ERROR."
+echo " ERROR, $NAME didn't start"
+fi
+
+# TODO: this can be removed when fabian fixes the socket permission bug
+sleep 3
+chmod g+rw /var/MonetDB5/dbfarm/.merovingian_*
+chmod g+rx /var/MonetDB5/dbfarm
+
+if [ "$START_ALL_DBS" = "yes" ]; then
+ /bin/su -c "/usr/bin/monetdb start -a" -s /bin/bash monetdb
 fi
 ;;
   stop)
 echo -n "Stopping $DESC: "
-start-stop-daemon --stop --quiet --pidfile $PIDFILE \
---exec $DAEMON
+start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON
 echo "$NAME."
 ;;
-  force-stop)
-echo -n "Forcefully stopping $DESC: "
-force_stop
-if ! running ; then
-echo "$NAME."
-else
-echo " ERROR."
-fi
-;;
-  #reload)
-#
-# If the daemon can reload its config files on the fly
-# for example by sending it SIGHUP, do it here.
-#
-# If the daemon responds to changes in its config file
-# directly anyway, make this a do-nothing entry.
-#
-# echo "Reloading $DESC configuration files."
-# start-stop-da

MonetDB: default - Merged from Jun2010 branch.

2010-06-22 Thread Sjoerd Mullender

Changeset: 4a2b13902748 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a2b13902748
Modified Files:
sql/debian/monetdb5-sql.init.d
sql/src/server/sql_parser.mx
Branch: default
Log Message:

Merged from Jun2010 branch.


diffs (20 lines):

diff -r dd95b836c486 -r 4a2b13902748 sql/debian/monetdb5-sql.init.d
--- a/sql/debian/monetdb5-sql.init.dTue Jun 22 11:47:40 2010 +0200
+++ b/sql/debian/monetdb5-sql.init.dTue Jun 22 13:13:32 2010 +0200
@@ -1,6 +1,15 @@
 #! /bin/sh
+### BEGIN INIT INFO
+# Provides:  mserver5-sql
+# Required-Start:$remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: MonetDB SQL service
+# Description:   MonetDB SQL service "merovingian".
+### END INIT INFO
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DAEMON=/usr/bin/merovingian
 NAME=merovingian
 DESC="MonetDB SQL server"
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - Merge.

2010-06-22 Thread Sjoerd Mullender

Changeset: dc19c5e2ef94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc19c5e2ef94
Modified Files:

Branch: Jun2010
Log Message:

Merge.


diffs (28 lines):

diff -r 5a05e8e0c50b -r dc19c5e2ef94 sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx  Tue Jun 22 13:00:42 2010 +0200
+++ b/sql/src/server/sql_parser.mx  Tue Jun 22 13:04:17 2010 +0200
@@ -2914,11 +2914,20 @@
 
 select_no_parens_orderby:
  select_no_parens opt_order_by_clause opt_limit opt_offset
-   { SelectNode *s = (SelectNode*)$1;
+{ 
  $$ = $1;
- s -> orderby = $2;
- s -> limit = $3;
- s -> offset = $4;
+ if ($2 || $3 != -1 || $4 != -1) {
+   if ($1 != NULL && $1->token == SQL_SELECT) {
+   SelectNode *s = (SelectNode*)$1;
+   
+   s -> orderby = $2;
+   s -> limit = $3;
+   s -> offset = $4;
+   } else {
+   yyerror("ORDER BY: missing select operator");
+   YYABORT;
+   }
+} 
}
 ;
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - Fixed so that it actuall works.

2010-06-22 Thread Sjoerd Mullender

Changeset: 5a05e8e0c50b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a05e8e0c50b
Modified Files:
sql/debian/monetdb5-sql.init.d
Branch: Jun2010
Log Message:

Fixed so that it actuall works.


diffs (92 lines):

diff -r 9fc3d7700822 -r 5a05e8e0c50b sql/debian/monetdb5-sql.init.d
--- a/sql/debian/monetdb5-sql.init.dTue Jun 22 11:46:59 2010 +0200
+++ b/sql/debian/monetdb5-sql.init.dTue Jun 22 13:00:42 2010 +0200
@@ -1,6 +1,15 @@
 #! /bin/sh
+### BEGIN INIT INFO
+# Provides:  mserver5-sql
+# Required-Start:$remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop:  0 1 6
+# Short-Description: MonetDB SQL service
+# Description:   MonetDB SQL service "merovingian".
+### END INIT INFO
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DAEMON=/usr/bin/merovingian
 NAME=mserver5-sql
 DESC="MonetDB SQL server"
@@ -8,19 +17,17 @@
 test -x $DAEMON || exit 0
 
 LOGDIR=/var/log/MonetDB
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/MonetDB/merovingian.pid
 DODTIME=1   # Time to wait for the server to die, in seconds
 # If this value is set too low you might not
 # let some servers to die gracefully and
 # 'restart' will not work
 
 # Include mserver5-sql defaults if available
-if [ -f /etc/default/mserver5-sql ] ; then
-. /etc/default/mserver5-sql
+if [ -f /etc/default/$NAME ] ; then
+. /etc/default/$NAME
 fi
 
-set -e
-
 running_pid()
 {
 # Check if a given process pid's cmdline matches a given name
@@ -58,7 +65,7 @@
 kill -9 $pid
 [ -n "$DODTIME" ] && sleep "$DODTIME"s
 if running ; then
-echo "Cannot kill $LABEL (pid=$pid)!"
+echo "Cannot kill $NAME (pid=$pid)!"
 exit 1
 fi
 fi
@@ -103,7 +110,7 @@
 #
 # echo "Reloading $DESC configuration files."
 # start-stop-daemon --stop --signal 1 --quiet --pidfile \
-#   /var/run/$NAME.pid --exec $DAEMON
+#   $PIDFILE --exec $DAEMON
   #;;
   force-reload)
 #
@@ -113,25 +120,25 @@
 # daemon isn't already running.
 # check wether $DAEMON is running. If so, restart
 start-stop-daemon --stop --test --quiet --pidfile \
-/var/run/$NAME.pid --exec $DAEMON \
+$PIDFILE --exec $DAEMON \
 && $0 restart \
 || exit 0
 ;;
   restart)
 echo -n "Restarting $DESC: "
 start-stop-daemon --stop --quiet --pidfile \
-/var/run/$NAME.pid --exec $DAEMON
+$PIDFILE --exec $DAEMON
 [ -n "$DODTIME" ] && sleep $DODTIME
 start-stop-daemon --start --quiet --pidfile \
-/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+$PIDFILE --exec $DAEMON -- $DAEMON_OPTS
 echo "$NAME."
 ;;
   status)
-echo -n "$LABEL is "
+echo -n "$NAME is "
 if running ;  then
 echo "running"
 else
-echo " not running."
+echo "not running."
 exit 1
 fi
 ;;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - back port of fix, in select with order by

2010-06-22 Thread Niels Nes

Changeset: 77151d685024 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77151d685024
Modified Files:
sql/src/server/sql_parser.mx
Branch: Jun2010
Log Message:

back port of fix, in select with order by


diffs (28 lines):

diff -r 9fc3d7700822 -r 77151d685024 sql/src/server/sql_parser.mx
--- a/sql/src/server/sql_parser.mx  Tue Jun 22 11:46:59 2010 +0200
+++ b/sql/src/server/sql_parser.mx  Tue Jun 22 12:32:41 2010 +0200
@@ -2914,11 +2914,20 @@
 
 select_no_parens_orderby:
  select_no_parens opt_order_by_clause opt_limit opt_offset
-   { SelectNode *s = (SelectNode*)$1;
+{ 
  $$ = $1;
- s -> orderby = $2;
- s -> limit = $3;
- s -> offset = $4;
+ if ($2 || $3 != -1 || $4 != -1) {
+   if ($1 != NULL && $1->token == SQL_SELECT) {
+   SelectNode *s = (SelectNode*)$1;
+   
+   s -> orderby = $2;
+   s -> limit = $3;
+   s -> offset = $4;
+   } else {
+   yyerror("ORDER BY: missing select operator");
+   YYABORT;
+   }
+} 
}
 ;
 
___
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...

2010-06-22 Thread Sjoerd Mullender

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: Jun2010 - Create monetdb user with correct group (monet...

2010-06-22 Thread Sjoerd Mullender

Changeset: 9fc3d7700822 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9fc3d7700822
Modified Files:
MonetDB4/debian/monetdb4-server.postinst
MonetDB5/debian/monetdb5-server.postinst
Branch: Jun2010
Log Message:

Create monetdb user with correct group (monetdb).


diffs (24 lines):

diff -r 81b61fff8276 -r 9fc3d7700822 MonetDB4/debian/monetdb4-server.postinst
--- a/MonetDB4/debian/monetdb4-server.postinst  Mon Jun 21 20:42:27 2010 +0200
+++ b/MonetDB4/debian/monetdb4-server.postinst  Tue Jun 22 11:46:59 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 81b61fff8276 -r 9fc3d7700822 MonetDB5/debian/monetdb5-server.postinst
--- a/MonetDB5/debian/monetdb5-server.postinst  Mon Jun 21 20:42:27 2010 +0200
+++ b/MonetDB5/debian/monetdb5-server.postinst  Tue Jun 22 11:46:59 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 with Jun2010

MonetDB: Jun2010 - approved new output also in the Jun2010 branch

MonetDB: Jun2010 - Fixed test script

MonetDB: default - merge with Jun2010

MonetDB: Jun2010 - made "leaks" tests work, again in the Jun2010...

MonetDB: default - Fix warning emitted by pkg-config by first ch...

MonetDB: default - merge with Jun2010: approved new error message

MonetDB: Jun2010 - approved new error message

MonetDB: default - Pseudo merge from Jun2010

MonetDB: Jun2010 - make it possible to use '?' in offset and limit

MonetDB: default - Merge from Jun2010 branch: Preparations for b...

MonetDB: Jun2010 - Preparations for building the Jun2010 release.

MonetDB: default - Merge backport.

MonetDB: Jun2010 - Backported all debian packaging fixes from de...

MonetDB: default - Merged from Jun2010 branch.

MonetDB: Jun2010 - Merge.

MonetDB: Jun2010 - Fixed so that it actuall works.

MonetDB: Jun2010 - back port of fix, in select with order by

MonetDB: default - Merge from Jun2010 branch: Create monetdb use...

MonetDB: Jun2010 - Create monetdb user with correct group (monet...

20 matches

Site Navigation

Mail list logo

Footer information