MonetDB: default - Use the possibility of having variable number...

2012-07-06 Thread Sjoerd Mullender 
Changeset: d8f89c50e9bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8f89c50e9bc
Modified Files:
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:

Use the possibility of having variable number of arguments in macros.


diffs (181 lines):

diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -142,12 +142,13 @@ deactivateCounter(str name)
  * The offline processing structure is the easiest. We merely have to
  * produce a correct tuple format for the front-end.
  */
-#define log(X, Y) if (eventstream) if (mnstr_printf(eventstream, X, Y)  0) \
-   { closeProfilerStream(); }
-#define log0(X) if (eventstream) if (mnstr_printf(eventstream, X)  0) \
-   { closeProfilerStream(); }
-#define log2(X, Y, Z) if (eventstream) if (mnstr_printf(eventstream, X, Y, Z) 
 0) \
-   { closeProfilerStream(); }
+#define log(...)   
\
+   do {
\
+   if (eventstream)
\
+   if (mnstr_printf(eventstream, __VA_ARGS__)  0) {   
\
+   closeProfilerStream();  
\
+   }   
\
+   } while (0)
 #define flushLog() if (eventstream) mnstr_flush(eventstream);
 
 /*
@@ -186,68 +187,68 @@ offlineProfilerHeader(void)
mal_unset_lock(mal_profileLock, profileLock);
return ;
}
-   log0(# );
+   log(# );
if (profileCounter[PROFevent].status) {
-   log0(event,\tstatus,\t);
+   log(event,\tstatus,\t);
}
if (profileCounter[PROFtime].status) {
-   log0(time,\t);
+   log(time,\t);
}
if (profileCounter[PROFthread].status) {
-   log0(thread,\t);
+   log(thread,\t);
}
if (profileCounter[PROFflow].status)
-   log0(claim,\tmemory,\t);
+   log(claim,\tmemory,\t);
if (profileCounter[PROFfunc].status) {
-   log0(function,\t);
+   log(function,\t);
}
if (profileCounter[PROFpc].status) {
-   log0(pc,\t);
+   log(pc,\t);
}
if (profileCounter[PROFticks].status) {
-   log0(usec,\t);
+   log(usec,\t);
}
if (profileCounter[PROFcpu].status) {
-   log0(utime,\t);
-   log0(cutime,\t);
-   log0(stime,\t);
-   log0(cstime,\t);
+   log(utime,\t);
+   log(cutime,\t);
+   log(stime,\t);
+   log(cstime,\t);
}
 
if (profileCounter[PROFmemory].status) {
-   log0(maxrss,\t);
-   log0(arena,\t);
-   log0(ordblks,\t);
-   log0(smblks,\t);
-   log0(hblkhd,\t);
-   log0(hblks,\t);
-   log0(fsmblks,\t);
-   log0(uordblks,\t);
+   log(maxrss,\t);
+   log(arena,\t);
+   log(ordblks,\t);
+   log(smblks,\t);
+   log(hblkhd,\t);
+   log(hblks,\t);
+   log(fsmblks,\t);
+   log(uordblks,\t);
}
if (profileCounter[PROFreads].status)
-   log0(blk reads,\t);
+   log(blk reads,\t);
if (profileCounter[PROFwrites].status)
-   log0(blk writes,\t);
+   log(blk writes,\t);
if (profileCounter[PROFprocess].status) {
-   log0(pg reclaim,\t);
-   log0(pg faults,\t);
-   log0(swaps,\t);
-   log0(ctxt switch,\t);
-   log0(inv switch,\t);
+   log(pg reclaim,\t);
+   log(pg faults,\t);
+   log(swaps,\t);
+   log(ctxt switch,\t);
+   log(inv switch,\t);
}
if (profileCounter[PROFrbytes].status)
-   log0(rbytes,\t);
+   log(rbytes,\t);
if (profileCounter[PROFwbytes].status)
-   log0(wbytes,\t);
+   log(wbytes,\t);
if (profileCounter[PROFaggr].status)
-   log0(count,\t totalticks,\t);
+   log(count,\t totalticks,\t);
if (profileCounter[PROFstmt].status)
-   log0(stmt,\t);
+   log(stmt,\t);
if (profileCounter[PROFtype].status)
-   log0(types,\t);
+   log(types,\t);
if (profileCounter[PROFuser].status)
-   log0(user,\t);
-   log0(# name\n);
+

MonetDB: Jul2012 - monetdbd: fix misc memory leaks

2012-07-06 Thread Fabian Groffen 
Changeset: 87e8d77d05df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=87e8d77d05df
Modified Files:
tools/merovingian/daemon/controlrunner.c
Branch: Jul2012
Log Message:

monetdbd: fix misc memory leaks

- the result from getDefaultProps() is malloced and needs to be freed
- the result from writePropsBuf() is malloced and needs to be freed

This keeps the memory usage of monetdbd constant over several monetdb
get, set, status and inherit calls.  Thanks Patchupedia in Bug #3111.


diffs (76 lines):

diff --git a/tools/merovingian/daemon/controlrunner.c 
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -146,12 +146,14 @@ control_authorise(
pwd = mcrypt_hashPassword(algo,
getConfVal(_mero_props, passphrase), chal);
if (strcmp(pwd, passwd) != 0) {
+   free(pwd);
Mfprintf(_mero_ctlout, %s: permission denied 
(bad passphrase)\n, host);
mnstr_printf(fout, !access denied\n);
mnstr_flush(fout);
return 0;
}
+   free(pwd);
 
mnstr_printf(fout, =OK\n);
mnstr_flush(fout);
@@ -422,6 +424,8 @@ static void ctl_handle_client(
len = snprintf(buf2, 
sizeof(buf2), OK\n);
send_client(!);
}
+   freeConfFile(props);
+   free(props);
}
} else if (strcmp(p, destroy) == 0) {
err e = db_destroy(q);
@@ -520,7 +524,7 @@ static void ctl_handle_client(
len = snprintf(buf2, sizeof(buf2), 
OK\n);
send_client(=);
}
-   } else if (strchr(p, '=') != NULL) {
+   } else if (strchr(p, '=') != NULL) { /* set */
char *val;
char doshare = 0;
 
@@ -644,10 +648,12 @@ static void ctl_handle_client(
/* send defaults to client */
writePropsBuf(_mero_db_props, pbuf);
send_list();
-   free(props);
 
Mfprintf(_mero_ctlout, %s: served 
default property 
list\n, origin);
+   freeConfFile(props);
+   free(props);
+   free(pbuf);
break;
}
 
@@ -658,6 +664,8 @@ static void ctl_handle_client(
Mfprintf(_mero_ctlerr, %s: get: 
msab_getStatus: 
%s\n, origin, e);
freeErr(e);
+   freeConfFile(props);
+   free(props);
break;
}
if (stats == NULL) {
@@ -666,6 +674,8 @@ static void ctl_handle_client(
len = snprintf(buf2, sizeof(buf2),
unknown database: 
%s\n, q);
send_client(!);
+   freeConfFile(props);
+   free(props);
break;
}
 
@@ -676,6 +686,7 @@ static void ctl_handle_client(
send_list();
freeConfFile(props);
free(props);
+   free(pbuf);
msab_freeStatus(stats);
 
Mfprintf(_mero_ctlout, %s: served property 
list for 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merged from Jul2012

2012-07-06 Thread Fabian Groffen 
Changeset: 9a59ff040bcf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a59ff040bcf
Modified Files:
monetdb5/mal/mal_profiler.c
tools/merovingian/daemon/controlrunner.c
Branch: default
Log Message:

Merged from Jul2012


diffs (123 lines):

diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -437,8 +437,10 @@ setLogFile(stream *fd, Module mod, str f
 {
(void)mod;  /* still unused */
mal_set_lock(mal_profileLock, profileLock);
-   if (eventstream )
+   if (eventstream ) {
+   mal_unset_lock(mal_profileLock, profileLock);
throw(IO, mal.profiler, Log file already set);
+   }
if (strcmp(fname, console) == 0)
eventstream = mal_clients[0].fdout;
else if (strcmp(fname, stdout) == 0)
@@ -446,6 +448,7 @@ setLogFile(stream *fd, Module mod, str f
else
eventstream = open_wastream(fname);
if (eventstream == NULL) {
+   mal_unset_lock(mal_profileLock, profileLock);
throw(IO, mal.profiler, RUNTIME_STREAM_FAILED);
}
mal_unset_lock(mal_profileLock, profileLock);
@@ -457,8 +460,10 @@ setLogStream(Module cntxt, str host, int
 {
(void)cntxt;/* still unused */
mal_set_lock(mal_profileLock, profileLock);
-   if ((eventstream = udp_wastream(host, port, profileStream)) == NULL)
+   if ((eventstream = udp_wastream(host, port, profileStream)) == NULL) {
+   mal_unset_lock(mal_profileLock, profileLock);
throw(IO, mal.profiler, RUNTIME_STREAM_FAILED);
+   }
eventstream = wbstream(eventstream, BUFSIZ);
mal_unset_lock(mal_profileLock, profileLock);
return MAL_SUCCEED;
@@ -469,8 +474,10 @@ setLogStreamStream(Module cntxt, stream 
 {
(void)cntxt;/* still unused */
mal_set_lock(mal_profileLock, profileLock);
-   if ((eventstream = s) == NULL)
+   if ((eventstream = s) == NULL) {
+   mal_unset_lock(mal_profileLock, profileLock);
throw(ILLARG, mal.profiler, stream must not be NULL);
+   }
eventstream = wbstream(eventstream, BUFSIZ);
mal_unset_lock(mal_profileLock, profileLock);
return MAL_SUCCEED;
diff --git a/tools/merovingian/daemon/controlrunner.c 
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -146,12 +146,14 @@ control_authorise(
pwd = mcrypt_hashPassword(algo,
getConfVal(_mero_props, passphrase), chal);
if (strcmp(pwd, passwd) != 0) {
+   free(pwd);
Mfprintf(_mero_ctlout, %s: permission denied 
(bad passphrase)\n, host);
mnstr_printf(fout, !access denied\n);
mnstr_flush(fout);
return 0;
}
+   free(pwd);
 
mnstr_printf(fout, =OK\n);
mnstr_flush(fout);
@@ -422,6 +424,8 @@ static void ctl_handle_client(
len = snprintf(buf2, 
sizeof(buf2), OK\n);
send_client(!);
}
+   freeConfFile(props);
+   free(props);
}
} else if (strcmp(p, destroy) == 0) {
err e = db_destroy(q);
@@ -520,7 +524,7 @@ static void ctl_handle_client(
len = snprintf(buf2, sizeof(buf2), 
OK\n);
send_client(=);
}
-   } else if (strchr(p, '=') != NULL) {
+   } else if (strchr(p, '=') != NULL) { /* set */
char *val;
char doshare = 0;
 
@@ -644,10 +648,12 @@ static void ctl_handle_client(
/* send defaults to client */
writePropsBuf(_mero_db_props, pbuf);
send_list();
-   free(props);
 
Mfprintf(_mero_ctlout, %s: served 
default property 
list\n, origin);
+   freeConfFile(props);
+   free(props);
+   free(pbuf);
break;
}
 
@@ -658,6 +664,8 @@ static void ctl_handle_client(
Mfprintf(_mero_ctlerr, %s: get: 
msab_getStatus: 
%s\n,

MonetDB: default - Extending the median tests

2012-07-06 Thread Martin Kersten 
Changeset: 9a6ca0855e39 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a6ca0855e39
Modified Files:
sql/test/Tests/median_stdev.sql
Branch: default
Log Message:

Extending the median tests
The test set should include a proper tests for median calculations.


diffs (19 lines):

diff --git a/sql/test/Tests/median_stdev.sql b/sql/test/Tests/median_stdev.sql
--- a/sql/test/Tests/median_stdev.sql
+++ b/sql/test/Tests/median_stdev.sql
@@ -15,6 +15,15 @@ INSERT INTO sampleData VALUES ( 3,  66 )
 INSERT INTO sampleData VALUES ( 4,  18 );
 INSERT INTO sampleData VALUES ( 5,   0 );
 INSERT INTO sampleData VALUES ( 5,   0 );
+INSERT INTO sampleData VALUES ( 5,   0 );
+
+SELECT count(*) from sampleData;
+
+-- Median tests
+SELECT median(numValue) FROM sampleData;  -- should return 6.5 (or 6, or 7)
+SELECT median(groupID) FROM sampleData;  -- should return 2
+SELECT groupID, median(numValue) FROM sampleData ORDER BY groupID;  -- should 
return (4, 5, 34.5, 18,  0)
+
 
 SELECT R.groupID, AVG(1.0*R.numValue) AS medianValue
 FROM
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Typo in query

2012-07-06 Thread Martin Kersten 
Changeset: 2e1e79ae7ca4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e1e79ae7ca4
Modified Files:
sql/test/Tests/median_stdev.sql
Branch: default
Log Message:

Typo in query


diffs (12 lines):

diff --git a/sql/test/Tests/median_stdev.sql b/sql/test/Tests/median_stdev.sql
--- a/sql/test/Tests/median_stdev.sql
+++ b/sql/test/Tests/median_stdev.sql
@@ -22,7 +22,7 @@ SELECT count(*) from sampleData;
 -- Median tests
 SELECT median(numValue) FROM sampleData;  -- should return 6.5 (or 6, or 7)
 SELECT median(groupID) FROM sampleData;  -- should return 2
-SELECT groupID, median(numValue) FROM sampleData ORDER BY groupID;  -- should 
return (4, 5, 34.5, 18,  0)
+SELECT groupID, median(numValue) FROM sampleData GROUP BY groupID;  -- should 
return (6, 5, 34.5, 18,  0)
 
 
 SELECT R.groupID, AVG(1.0*R.numValue) AS medianValue
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Apr2012 - approved output after recent changes

2012-07-06 Thread Niels Nes 
Changeset: b490b640b431 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b490b640b431
Modified Files:
monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/insert_queue.sql
Branch: Apr2012
Log Message:

approved output after recent changes

removed not needed library statement


diffs (73 lines):

diff --git a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal 
b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
--- a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
+++ b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
@@ -16,6 +16,4 @@
 # All Rights Reserved.
 
 # This loads the opt_sql_append optimizer module
-library opt_sql_append;
 include opt_sql_append;
-
diff --git a/sql/test/ssqq/Tests/insert_query.stable.out 
b/sql/test/ssqq/Tests/insert_query.stable.out
--- a/sql/test/ssqq/Tests/insert_query.stable.out
+++ b/sql/test/ssqq/Tests/insert_query.stable.out
@@ -85,7 +85,7 @@ Ready.
 % single_value # name
 % int # type
 % 1 # length
-[ 4]
+[ 3]
 #select * from quser;
 % sys.quser,   sys.quser,  sys.quser,  sys.quser,  sys.quser,  
sys.quser # table_name
 % quser_id,user_name,  uid,emailaddress,   password,   enabled 
# name
@@ -100,7 +100,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select * from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_add,  queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
diff --git a/sql/test/ssqq/Tests/insert_queue.stable.out 
b/sql/test/ssqq/Tests/insert_queue.stable.out
--- a/sql/test/ssqq/Tests/insert_queue.stable.out
+++ b/sql/test/ssqq/Tests/insert_queue.stable.out
@@ -39,7 +39,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select queue_id, query_id, queue_number, os_version, monetdb_version, 
start_query, query_ready from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
@@ -102,7 +102,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select queue_id, query_id, queue_number, os_version, monetdb_version, 
start_query, query_ready from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
@@ -110,7 +110,7 @@ Ready.
 % 1,   1,  1,  5,  5,  26, 26 # length
 [ 1,   1,  0,  monet,linux,NULL,   NULL]
 [ 3,   2,  0,  monet,linux,NULL,   NULL]
-[ 4,   4,  0,  monet,linux,NULL,   NULL]
+[ 4,   3,  0,  monet,linux,NULL,   NULL]
 
 # 13:39:03   
 # 13:39:03   Done.
diff --git a/sql/test/ssqq/insert_queue.sql b/sql/test/ssqq/insert_queue.sql
--- a/sql/test/ssqq/insert_queue.sql
+++ b/sql/test/ssqq/insert_queue.sql
@@ -32,7 +32,7 @@ select queue_id, query_id, queue_number,
 
 set id_result = -1;
 
-set id_result = insert_queue(4, 'monet', 'linux');
+set id_result = insert_queue(3, 'monet', 'linux');
 
 select id_result;

MonetDB: Jul2012 - fixed typo, fixed problem with median of full...

2012-07-06 Thread Niels Nes 
Changeset: 25855010c869 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25855010c869
Modified Files:
sql/backends/monet5/sql.mx
Branch: Jul2012
Log Message:

fixed typo, fixed problem with median of full columns


diffs (12 lines):

diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -7238,7 +7238,7 @@ address SQLmiddle;
 
 function aggr.median(a:bat[:oid,:any_1]):any_1;
v := algebra.sortTail(a);
-   return sql.middle_val(a);
+   return sql.middle_val(v);
 end aggr.median;
 
 function 
aggr.median(a:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1];
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jul2012 - Pre-release version number update.

2012-07-06 Thread Fabian Groffen 
Changeset: 3dbb68dcca77 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3dbb68dcca77
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Jul2012
Log Message:

Pre-release version number update.


diffs (truncated from 440 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.11.0
+%define version 11.11.1
 %{!?buildno: %define buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB ODBC Driver
-ProductCode = 8:{4E161B98-9FC8-4512-97D8-EA76C354DA4D}
-PackageCode = 8:{D7B51DE5-F620-464F-89E1-5DE3D9103AB2}
+ProductCode = 8:{DB40D518-7433-46EC-8A02-5F90DA0AFE22}
+PackageCode = 8:{24777F35-55AD-4F0F-8AD2-082A6765D7CB}
 UpgradeCode = 8:{C1F69378-3F5C-4120-8224-32F07D3458F3}
 AspNetVersion = 8:4.0.30319.0
 RestartWWWService = 11:FALSE
 RemovePreviousVersions = 11:TRUE
 DetectNewerInstalledVersion = 11:TRUE
 InstallAllUsers = 11:TRUE
-ProductVersion = 8:11.11.0
+ProductVersion = 8:11.11.1
 Manufacturer = 8:MonetDB
 ARPHELPTELEPHONE = 8:
 ARPHELPLINK = 8:http://www.monetdb.org/;
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -425,14 +425,14 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB5 SQL GIS Module
-ProductCode = 8:{A61BE52A-99A2-4503-BB5B-3837B0708862}
-PackageCode = 8:{5F8AB146-C5BB-4961-95DE-9848D2AF533A}
+ProductCode = 8:{013B9F91-3915-4C1F-9A83-D243BDC49C1A}
+PackageCode = 8:{0F437A51-90C5-43B4-B0B9-D7F941687304}
 UpgradeCode = 8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}
 RestartWWWService = 11:FALSE
 RemovePreviousVersions = 11:TRUE
 DetectNewerInstalledVersion = 11:TRUE
 InstallAllUsers = 11:TRUE
-ProductVersion = 8:11.11.0
+ProductVersion = 8:11.11.1
 Manufacturer = 8:MonetDB
 ARPHELPTELEPHONE = 8:
 ARPHELPLINK = 8:http://www.monetdb.org/;
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -2893,7 +2893,7 @@
 }
 
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA
 {
-SourcePath = 
8:share\\doc\\MonetDB-SQL-11.11.0\\dump-restore.txt
+SourcePath = 
8:share\\doc\\MonetDB-SQL-11.11.1\\dump-restore.txt
 TargetName = 8:dump-restore.txt
 Tag = 8:
 Folder = 8:_6C21CE578F0941D09FDD9951A229FF37
@@ -3733,7 +3733,7 @@
 }
 
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6
 {
-SourcePath = 
8:share\\doc\\MonetDB-SQL-11.11.0\\dump-restore.html
+SourcePath = 
8:share\\doc\\MonetDB-SQL-11.11.1\\dump-restore.html
 TargetName = 8:dump-restore.html
 Tag = 8:
 Folder = 8:_6C21CE578F0941D09FDD9951A229FF37
@@ -5317,7 +5317,7 @@
 {
 
{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37
 {
-Name = 8:MonetDB-SQL-11.11.0
+Name = 8:MonetDB-SQL-11.11.1
 AlwaysCreate = 11:FALSE
 Condition = 8:
 Transitive = 11:FALSE
@@ -5359,15 +5359,15 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB5
-ProductCode = 8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}
-PackageCode = 8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}
+ProductCode =

MonetDB: default - Merge with Jul2012 branch, not changing any f...

2012-07-06 Thread Fabian Groffen 
Changeset: d66c00cdfed4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d66c00cdfed4
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with Jul2012 branch, not changing any files.

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

MonetDB: Jul2012 - Moved contents of ChangeLog.Apr2012 and Chang...

2012-07-06 Thread Fabian Groffen 
Changeset: 99c533046fba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99c533046fba
Added Files:
debian/libmonetdb6.install
Removed Files:
buildtools/ChangeLog.Apr2012
clients/ChangeLog.Apr2012
debian/libmonetdb4.install
gdk/ChangeLog.Apr2012
geom/ChangeLog.Apr2012
java/ChangeLog.Apr2012
monetdb5/ChangeLog.Apr2012
sql/ChangeLog.Apr2012
testing/ChangeLog.Apr2012
tools/merovingian/ChangeLog.Apr2012
Modified Files:
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2012
clients/ChangeLog-Archive
clients/ChangeLog.Jul2012
debian/changelog
debian/control
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2012
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2012
sql/ChangeLog-Archive
sql/ChangeLog.Jul2012
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2012
Branch: Jul2012
Log Message:

Moved contents of ChangeLog.Apr2012 and ChangeLog.Jul2012 to MonetDB.spec, 
debian/changelog and ChangeLog-Archive.


diffs (truncated from 436 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV i...@monetdb.org
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Apr2012-SP2/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jul2012/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -679,6 +679,48 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 06 2012 Fabian Groffen fab...@monetdb.org - 11.11.1-20120706
+- Rebuilt.
+
+* Mon Jul  2 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Created seperate RPM and DEB packages for MonetDB/JAQL.
+
+* Fri Jun 29 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- sql: COPY INTO now accepts optional parenthesis for file argument.
+  Binary COPY INTO now requires 'COPY BINARY INTO'.
+
+* Fri Jun 29 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- clients: ODBC: Fixed a bug where SQLNativeSql expected a statment handle 
instead
+  of a connection handle.
+
+* Thu Jun 14 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- monetdb5: Crackers code has been removed.  Development continues in the 
holindex
+  branch.
+
+* Wed Jun 13 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- merovingian: Removed erroneously (re-)added master and slave properties, this
+  functionality is currently not working.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Removed --enable-bits option from configure.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Split the MonetDB-client-ruby RPM package into two and named 
them in
+  accordance with the Fedora packaging guidelines as rubygem-gem-name.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- gdk: The sorted property, which was used to maintain whether a column in
+  a BAT was sorted or reverse sorted, has been replaced by a pair of
+  properties, sorted and revsorted.  These new properties can be set
+  independently (unlike the old sorted property), and so if both are set,
+  the column must be constant.  In addition, internal property checking
+  has been overhauled.  Now, when a property is set incorrectly, and
+  when assertions are enabled, an assertion will go off.  There is also
+  a function which can derive properties.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- gdk: Implemented proper overflow checking on all arithmetic operations.
+
 * Thu Jun 07 2012 Sjoerd Mullender sjo...@acm.org - 11.9.7-20120607
 - Rebuilt.
 
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,16 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Jul  2 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- Created seperate RPM and DEB packages for MonetDB/JAQL.
+
+* Tue Jun  5 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- Removed --enable-bits option from configure.
+
+* Thu Apr 19 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- Split the MonetDB-client-ruby RPM package into two and named them in
+  accordance with the Fedora packaging guidelines as rubygem-gem-name.
+
 * Wed May  2 2012 Sjoerd Mullender sjo...@acm.org - 11.9.3-20120514
 - Windows: we now use OpenSSL 1.0.1b.
 
diff --git a/buildtools/ChangeLog.Apr2012 b/buildtools/ChangeLog.Apr2012
deleted file mode 100644
--- a/buildtools/ChangeLog.Apr2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog

MonetDB: Jul2012 - Setting tag Jul2012_1 for the release build.

2012-07-06 Thread Fabian Groffen 
Changeset: 6cc0a74a5518 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6cc0a74a5518
Modified Files:
.hgtags
Branch: Jul2012
Log Message:

Setting tag Jul2012_1 for the release build.


diffs (8 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -484,3 +484,4 @@ ebb4a17093e63a199a1d5d27855aa8a31c7e7785
 06c3e1846c2fc399d72edcac1ed0d877934fab67 Jun2012_root
 94ffb491c3f2a9dc47c1371760b928bb7d35c050 Apr2012_7
 95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release
+99c533046fba872cd4c23cf9a64a0e54d61f6bae Jul2012_1
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jul2012 - Setting tag Jul2012_release for the release b...

2012-07-06 Thread Fabian Groffen 
Changeset: afd648d44597 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afd648d44597
Modified Files:
.hgtags
Branch: Jul2012
Log Message:

Setting tag Jul2012_release for the release build.


diffs (8 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -485,3 +485,4 @@ 06c3e1846c2fc399d72edcac1ed0d877934fab67
 94ffb491c3f2a9dc47c1371760b928bb7d35c050 Apr2012_7
 95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release
 99c533046fba872cd4c23cf9a64a0e54d61f6bae Jul2012_1
+6cc0a74a5518ce234159fadebcc82976165a5200 Jul2012_release
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Jul2012 branch.

2012-07-06 Thread Fabian Groffen 
Changeset: 874d05ee4560 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=874d05ee4560
Added Files:
debian/libmonetdb6.install
Removed Files:
buildtools/ChangeLog.Apr2012
clients/ChangeLog.Apr2012
debian/libmonetdb4.install
gdk/ChangeLog.Apr2012
geom/ChangeLog.Apr2012
java/ChangeLog.Apr2012
monetdb5/ChangeLog.Apr2012
sql/ChangeLog.Apr2012
testing/ChangeLog.Apr2012
tools/merovingian/ChangeLog.Apr2012
Modified Files:
.hgtags
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2012
clients/ChangeLog-Archive
clients/ChangeLog.Jul2012
debian/changelog
debian/control
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2012
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2012
sql/ChangeLog-Archive
sql/ChangeLog.Jul2012
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2012
Branch: default
Log Message:

Merge with Jul2012 branch.


diffs (truncated from 445 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -484,3 +484,5 @@ ebb4a17093e63a199a1d5d27855aa8a31c7e7785
 06c3e1846c2fc399d72edcac1ed0d877934fab67 Jun2012_root
 94ffb491c3f2a9dc47c1371760b928bb7d35c050 Apr2012_7
 95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release
+99c533046fba872cd4c23cf9a64a0e54d61f6bae Jul2012_1
+6cc0a74a5518ce234159fadebcc82976165a5200 Jul2012_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV i...@monetdb.org
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Apr2012-SP2/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jul2012/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -679,6 +679,48 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 06 2012 Fabian Groffen fab...@monetdb.org - 11.11.1-20120706
+- Rebuilt.
+
+* Mon Jul  2 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Created seperate RPM and DEB packages for MonetDB/JAQL.
+
+* Fri Jun 29 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- sql: COPY INTO now accepts optional parenthesis for file argument.
+  Binary COPY INTO now requires 'COPY BINARY INTO'.
+
+* Fri Jun 29 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- clients: ODBC: Fixed a bug where SQLNativeSql expected a statment handle 
instead
+  of a connection handle.
+
+* Thu Jun 14 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- monetdb5: Crackers code has been removed.  Development continues in the 
holindex
+  branch.
+
+* Wed Jun 13 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- merovingian: Removed erroneously (re-)added master and slave properties, this
+  functionality is currently not working.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Removed --enable-bits option from configure.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Split the MonetDB-client-ruby RPM package into two and named 
them in
+  accordance with the Fedora packaging guidelines as rubygem-gem-name.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- gdk: The sorted property, which was used to maintain whether a column in
+  a BAT was sorted or reverse sorted, has been replaced by a pair of
+  properties, sorted and revsorted.  These new properties can be set
+  independently (unlike the old sorted property), and so if both are set,
+  the column must be constant.  In addition, internal property checking
+  has been overhauled.  Now, when a property is set incorrectly, and
+  when assertions are enabled, an assertion will go off.  There is also
+  a function which can derive properties.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- gdk: Implemented proper overflow checking on all arithmetic operations.
+
 * Thu Jun 07 2012 Sjoerd Mullender sjo...@acm.org - 11.9.7-20120607
 - Rebuilt.
 
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,16 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Jul  2 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- Created seperate RPM and DEB packages for MonetDB/JAQL.
+
+* Tue Jun  5 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- Removed --enable-bits option from configure.
+
+* Thu Apr 19 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- Split the MonetDB-client-ruby RPM package into two and named them in
+  accordance with the Fedora

MonetDB: Jul2012 - Post release build.

2012-07-06 Thread Fabian Groffen 
Changeset: 1a11b7264ea0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a11b7264ea0
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Jul2012
Log Message:

Post release build.


diffs (truncated from 382 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.11.1
+%define version 11.11.2
 %{!?buildno: %define buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 RemovePreviousVersions = 11:TRUE
 DetectNewerInstalledVersion = 11:TRUE
 InstallAllUsers = 11:TRUE
-ProductVersion = 8:11.11.1
+ProductVersion = 8:11.11.2
 Manufacturer = 8:MonetDB
 ARPHELPTELEPHONE = 8:
 ARPHELPLINK = 8:http://www.monetdb.org/;
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
 RemovePreviousVersions = 11:TRUE
 DetectNewerInstalledVersion = 11:TRUE
 InstallAllUsers = 11:TRUE
-ProductVersion = 8:11.11.1
+ProductVersion = 8:11.11.2
 Manufacturer = 8:MonetDB
 ARPHELPTELEPHONE = 8:
 ARPHELPLINK = 8:http://www.monetdb.org/;
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -2893,7 +2893,7 @@
 }
 
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA
 {
-SourcePath = 
8:share\\doc\\MonetDB-SQL-11.11.1\\dump-restore.txt
+SourcePath = 
8:share\\doc\\MonetDB-SQL-11.11.2\\dump-restore.txt
 TargetName = 8:dump-restore.txt
 Tag = 8:
 Folder = 8:_6C21CE578F0941D09FDD9951A229FF37
@@ -3733,7 +3733,7 @@
 }
 
{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6
 {
-SourcePath = 
8:share\\doc\\MonetDB-SQL-11.11.1\\dump-restore.html
+SourcePath = 
8:share\\doc\\MonetDB-SQL-11.11.2\\dump-restore.html
 TargetName = 8:dump-restore.html
 Tag = 8:
 Folder = 8:_6C21CE578F0941D09FDD9951A229FF37
@@ -5317,7 +5317,7 @@
 {
 
{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37
 {
-Name = 8:MonetDB-SQL-11.11.1
+Name = 8:MonetDB-SQL-11.11.2
 AlwaysCreate = 11:FALSE
 Condition = 8:
 Transitive = 11:FALSE
@@ -5367,7 +5367,7 @@
 RemovePreviousVersions = 11:TRUE
 DetectNewerInstalledVersion = 11:TRUE
 InstallAllUsers = 11:TRUE
-ProductVersion = 8:11.11.1
+ProductVersion = 8:11.11.2
 Manufacturer = 8:MonetDB
 ARPHELPTELEPHONE = 8:
 ARPHELPLINK = 8:http://www.monetdb.org/;
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 RemovePreviousVersions = 11:TRUE
 DetectNewerInstalledVersion = 11:TRUE
 InstallAllUsers = 11:TRUE
-ProductVersion = 8:11.11.1
+ProductVersion = 8:11.11.2
 Manufacturer = 8:MonetDB
 ARPHELPTELEPHONE = 8:
 ARPHELPLINK = 8:http://www.monetdb.org/;
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
 RemovePreviousVersions = 11:TRUE
 DetectNewerInstalledVersion = 11:TRUE
 InstallAllUsers = 11:TRUE
-ProductVersion = 8:11.11.1
+

MonetDB: default - Merge with branch, not changing any files.

2012-07-06 Thread Fabian Groffen 
Changeset: 6c7a18bfabc3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c7a18bfabc3
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with branch, not changing any files.

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

MonetDB: Jul2012 - Merged with parallel Jul2012 branch head

2012-07-06 Thread Fabian Groffen 
Changeset: bd074bb9337a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd074bb9337a
Modified Files:
sql/backends/monet5/sql.mx
Branch: Jul2012
Log Message:

Merged with parallel Jul2012 branch head


diffs (12 lines):

diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -7238,7 +7238,7 @@ address SQLmiddle;
 
 function aggr.median(a:bat[:oid,:any_1]):any_1;
v := algebra.sortTail(a);
-   return sql.middle_val(a);
+   return sql.middle_val(v);
 end aggr.median;
 
 function 
aggr.median(a:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1];
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merged with parallel default branch head

2012-07-06 Thread Fabian Groffen 
Changeset: 3873db8e53db for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3873db8e53db
Modified Files:
sql/test/Tests/median_stdev.sql
Branch: default
Log Message:

Merged with parallel default branch head


diffs (19 lines):

diff --git a/sql/test/Tests/median_stdev.sql b/sql/test/Tests/median_stdev.sql
--- a/sql/test/Tests/median_stdev.sql
+++ b/sql/test/Tests/median_stdev.sql
@@ -15,6 +15,15 @@ INSERT INTO sampleData VALUES ( 3,  66 )
 INSERT INTO sampleData VALUES ( 4,  18 );
 INSERT INTO sampleData VALUES ( 5,   0 );
 INSERT INTO sampleData VALUES ( 5,   0 );
+INSERT INTO sampleData VALUES ( 5,   0 );
+
+SELECT count(*) from sampleData;
+
+-- Median tests
+SELECT median(numValue) FROM sampleData;  -- should return 6.5 (or 6, or 7)
+SELECT median(groupID) FROM sampleData;  -- should return 2
+SELECT groupID, median(numValue) FROM sampleData GROUP BY groupID;  -- should 
return (6, 5, 34.5, 18,  0)
+
 
 SELECT R.groupID, AVG(1.0*R.numValue) AS medianValue
 FROM
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Split the GDKenv BAT

2012-07-06 Thread Martin Kersten 
Changeset: 6d02a93eb19a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d02a93eb19a
Modified Files:
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/modules/mal/inspect.c
Branch: default
Log Message:

Split the GDKenv BAT
Moving towards (v)oid headed BATs calls for changing some
internal ones as well. Aside from this one, we need to
change BAT used in the logger (freed).


diffs (95 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -34,7 +34,8 @@
 static char GDKdbfarmStr[PATHLENGTH] = { dbfarm };
 static char GDKdbnameStr[PATHLENGTH] = { 0 };
 
-BAT *GDKenv = NULL;
+BAT *GDKkey = NULL;
+BAT *GDKval = NULL;
 
 #include signal.h
 
@@ -116,10 +117,10 @@ GDKenvironment(str dbname, str dbfarm)
 char *
 GDKgetenv(const char *name)
 {
-   BUN b = BUNfnd(GDKenv, (ptr) name);
+   BUN b = BUNfnd(BATmirror(GDKkey), (ptr) name);
 
if (b != BUN_NONE) {
-   BATiter GDKenvi = bat_iterator(GDKenv);
+   BATiter GDKenvi = bat_iterator(GDKval);
return BUNtail(GDKenvi, b);
}
return NULL;
@@ -160,8 +161,10 @@ GDKgetenv_int(const char *name, int def)
 void
 GDKsetenv(str name, str value)
 {
-   BUNins(GDKenv, name, value, FALSE);
-   BATfakeCommit(GDKenv);
+   BUNappend(GDKkey, name, FALSE);
+   BUNappend(GDKval, value, FALSE);
+   BATfakeCommit(GDKkey);
+   BATfakeCommit(GDKval);
 }
 
 
@@ -1214,12 +1217,21 @@ GDKinit(opt *set, int setlen)
 
HEAPcacheInit();
 
-   GDKenv = BATnew(TYPE_str, TYPE_str, 100);
-   if (GDKenv == NULL)
+   GDKkey = BATnew(TYPE_void, TYPE_str, 100);
+   GDKval = BATnew(TYPE_void, TYPE_str, 100);
+   if (GDKkey == NULL)
GDKfatal(GDKinit: Could not create environment BAT);
-   BATkey(GDKenv, BOUND2BTRUE);
-   BATrename(GDKenv, monet_environment);
-   BATmode(GDKenv, TRANSIENT);
+   if (GDKval == NULL)
+   GDKfatal(GDKinit: Could not create environment BAT);
+   BATseqbase(GDKkey,0);
+   BATkey(GDKkey, BOUND2BTRUE);
+   BATrename(GDKkey, environment_key);
+   BATmode(GDKkey, TRANSIENT);
+
+   BATseqbase(GDKval,0);
+   BATkey(GDKval, BOUND2BTRUE);
+   BATrename(GDKval, environment_val);
+   BATmode(GDKval, TRANSIENT);
 
n = (opt *) malloc(setlen * sizeof(opt));
for (i = 0; i  setlen; i++) {
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -22,7 +22,8 @@
 
 #include monet_options.h
 
-gdk_export BAT *GDKenv;
+gdk_export BAT *GDKkey;
+gdk_export BAT *GDKval;
 
 gdk_export char *GDKgetenv(const char *name);
 
diff --git a/monetdb5/modules/mal/inspect.c b/monetdb5/modules/mal/inspect.c
--- a/monetdb5/modules/mal/inspect.c
+++ b/monetdb5/modules/mal/inspect.c
@@ -488,10 +488,10 @@ INSPECTgetEnvironment(int *ret, int *ret
 {
BAT *b, *bn;
 
-   b= VIEWhead(GDKenv);
+   b= VIEWhead(BATmirror(GDKkey));
if (b == 0)
throw(MAL, inspect.getEnvironment, MAL_MALLOC_FAIL);
-   bn= VIEWhead(BATmirror(GDKenv));
+   bn= VIEWhead(BATmirror(GDKval));
if (bn == 0){
BBPreleaseref(b-batCacheid);
throw(MAL, inspect.getEnvironment, MAL_MALLOC_FAIL);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jul2012 - Merge with Apr2012 branch.

2012-07-06 Thread Stefan Manegold 
Changeset: d05e2fc2c3af for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d05e2fc2c3af
Modified Files:
monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/insert_queue.sql
Branch: Jul2012
Log Message:

Merge with Apr2012 branch.


diffs (73 lines):

diff --git a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal 
b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
--- a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
+++ b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
@@ -16,6 +16,4 @@
 # All Rights Reserved.
 
 # This loads the opt_sql_append optimizer module
-library opt_sql_append;
 include opt_sql_append;
-
diff --git a/sql/test/ssqq/Tests/insert_query.stable.out 
b/sql/test/ssqq/Tests/insert_query.stable.out
--- a/sql/test/ssqq/Tests/insert_query.stable.out
+++ b/sql/test/ssqq/Tests/insert_query.stable.out
@@ -85,7 +85,7 @@ Ready.
 % single_value # name
 % int # type
 % 1 # length
-[ 4]
+[ 3]
 #select * from quser;
 % sys.quser,   sys.quser,  sys.quser,  sys.quser,  sys.quser,  
sys.quser # table_name
 % quser_id,user_name,  uid,emailaddress,   password,   enabled 
# name
@@ -100,7 +100,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select * from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_add,  queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
diff --git a/sql/test/ssqq/Tests/insert_queue.stable.out 
b/sql/test/ssqq/Tests/insert_queue.stable.out
--- a/sql/test/ssqq/Tests/insert_queue.stable.out
+++ b/sql/test/ssqq/Tests/insert_queue.stable.out
@@ -39,7 +39,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select queue_id, query_id, queue_number, os_version, monetdb_version, 
start_query, query_ready from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
@@ -102,7 +102,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select queue_id, query_id, queue_number, os_version, monetdb_version, 
start_query, query_ready from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
@@ -110,7 +110,7 @@ Ready.
 % 1,   1,  1,  5,  5,  26, 26 # length
 [ 1,   1,  0,  monet,linux,NULL,   NULL]
 [ 3,   2,  0,  monet,linux,NULL,   NULL]
-[ 4,   4,  0,  monet,linux,NULL,   NULL]
+[ 4,   3,  0,  monet,linux,NULL,   NULL]
 
 # 13:39:03   
 # 13:39:03   Done.
diff --git a/sql/test/ssqq/insert_queue.sql b/sql/test/ssqq/insert_queue.sql
--- a/sql/test/ssqq/insert_queue.sql
+++ b/sql/test/ssqq/insert_queue.sql
@@ -32,7 +32,7 @@ select queue_id, query_id, queue_number,
 
 set id_result = -1;
 
-set id_result = insert_queue(4, 'monet', 'linux');
+set id_result = insert_queue(3, 'monet', 'linux');
 
 select id_result;
 
___
Checkin-list mailing list

MonetDB: Jul2012 - fix bug 3099. ie don't lookup views outside t...

2012-07-06 Thread Niels Nes 
Changeset: 6a9b850bc58f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a9b850bc58f
Added Files:
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.err
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out
Modified Files:
sql/server/rel_select.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/test/BugTracker-2012/Tests/All
Branch: Jul2012
Log Message:

fix bug 3099. ie don't lookup views outside the from.


diffs (295 lines):

diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -1612,7 +1612,7 @@ table_ref(mvc *sql, sql_rel *rel, symbol
tpe-comp_type) {
temp_table = stack_find_rel_var(sql, tname);
t = tpe-comp_type;
-   } else {
+   } else if (sql-use_views){
temp_table = stack_find_rel_view(sql, tname);
}
if (temp_table)
@@ -1771,7 +1771,7 @@ rel_column_ref(mvc *sql, sql_rel **rel, 
 
/* some views are just in the stack,
   like before and after updates views */
-   if (!exp) {
+   if (!exp  sql-use_views) {
sql_rel *v = stack_find_rel_view(sql, tname);
 
if (v) {
@@ -5067,6 +5067,7 @@ rel_query(mvc *sql, sql_rel *rel, symbol
sql_rel *res = NULL;
SelectNode *sn = NULL;
int used = 0;
+   int old = sql-use_views;
 
if (sq-token != SQL_SELECT)
return table_ref(sql, rel, sq);
@@ -5080,6 +5081,7 @@ rel_query(mvc *sql, sql_rel *rel, symbol
return sql_error(sql, 01, SELECT: ORDER BY only allowed on 
outermost SELECT);
 
 
+   sql-use_views = 1;
if (sn-from) { /* keep variable list with tables and names */
dlist *fl = sn-from-data.lval;
dnode *n = NULL;
@@ -5111,8 +5113,10 @@ rel_query(mvc *sql, sql_rel *rel, symbol
res = rel_crossproduct(sql-sa, rel, res, op_join);
}
} else if (toplevel || !res) {  /* only on top level query */
+   sql-use_views = old;
return rel_simple_select(sql, rel, sn-where, sn-selection, 
sn-distinct);
}
+   sql-use_views = old;
if (res)
rel = rel_select_exp(sql, res, rel, sn, ek);
return rel;
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -409,6 +409,7 @@ mvc_create(int clientid, backend_stack s
m-vars = NEW_ARRAY(sql_var, m-sizevars);
m-topvars = 0;
m-frame = 1;
+   m-use_views = 0;
m-argmax = MAXPARAMS;
m-args = NEW_ARRAY(atom*,m-argmax);
m-argc = 0;
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -90,6 +90,7 @@ typedef struct mvc {
int topvars;
int sizevars;
int frame;
+   int use_views;
atom **args;
int argc;
int argmax;
diff --git a/sql/test/BugTracker-2012/Tests/All 
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -44,3 +44,4 @@ predicate_select.Bug-3090
 hash_join_crash.Bug-3089
 row-number-nyi.Bug-3087
 insert_serial_with_unique_key.Bug-3091
+with_and_exists.Bug-3099
diff --git a/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql 
b/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
@@ -0,0 +1,56 @@
+CREATE TABLE rank (pre INTEGER, post INTEGER);
+INSERT INTO rank VALUES (1, 6);
+INSERT INTO rank VALUES (2, 3);
+INSERT INTO rank VALUES (4, 5);
+
+WITH
+  span1 AS ( SELECT pre FROM rank ),
+  span2 AS ( SELECT pre FROM rank )
+SELECT span1.pre AS pre1, span2.pre AS pre2
+FROM   span1, span2
+WHERE  EXISTS (
+ SELECT 1
+ FROM   rank as ancestor
+ WHERE  ancestor.pre  span1.pre
+ ANDspan1.pre  ancestor.post
+ ANDancestor.pre  span2.pre
+ ANDspan2.pre  ancestor.post)
+ANDspan1.pre  span2.pre;
+
+WITH
+  span1 AS ( SELECT pre AS pre1 FROM rank ),
+  span2 AS ( SELECT pre AS pre2 FROM rank )
+SELECT DISTINCT span1.pre1, span2.pre2
+FROM   span1, span2
+WHERE  EXISTS (
+ SELECT 1
+ FROM   rank as ancestor
+ WHERE  ancestor.pre  span1.pre1
+ ANDspan1.pre1  ancestor.post
+ ANDancestor.pre  span2.pre2
+ ANDspan2.pre2  ancestor.post)
+ANDspan1.pre1  span2.pre2;
+
+SELECT DISTINCT span1.pre, span2.pre
+FROM   rank AS span1, rank AS span2
+WHERE  EXISTS (
+

MonetDB: Jul2012 - merging

2012-07-06 Thread Niels Nes 
Changeset: 5f8b3b18fb4c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f8b3b18fb4c
Added Files:
debian/libmonetdb6.install
Removed Files:
buildtools/ChangeLog.Apr2012
clients/ChangeLog.Apr2012
debian/libmonetdb4.install
gdk/ChangeLog.Apr2012
geom/ChangeLog.Apr2012
java/ChangeLog.Apr2012
monetdb5/ChangeLog.Apr2012
sql/ChangeLog.Apr2012
testing/ChangeLog.Apr2012
tools/merovingian/ChangeLog.Apr2012
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2012
clients/ChangeLog-Archive
clients/ChangeLog.Jul2012
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python/setup.py
configure.ag
debian/changelog
debian/control
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2012
gdk/libbat.rc
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2012
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Jul2012
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2012
vertoo.data
Branch: Jul2012
Log Message:

merging


diffs (truncated from 864 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -484,3 +484,5 @@ ebb4a17093e63a199a1d5d27855aa8a31c7e7785
 06c3e1846c2fc399d72edcac1ed0d877934fab67 Jun2012_root
 94ffb491c3f2a9dc47c1371760b928bb7d35c050 Apr2012_7
 95df797091e0a19c18771378f80eb8652742b062 Apr2012_SP2_release
+99c533046fba872cd4c23cf9a64a0e54d61f6bae Jul2012_1
+6cc0a74a5518ce234159fadebcc82976165a5200 Jul2012_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.11.0
+%define version 11.11.2
 %{!?buildno: %define buildno %(date +%Y%m%d)}
 
 # groups of related archs
@@ -27,7 +27,7 @@ Vendor: MonetDB BV i...@monetdb.org
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Apr2012-SP2/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Jul2012/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -679,6 +679,48 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul 06 2012 Fabian Groffen fab...@monetdb.org - 11.11.1-20120706
+- Rebuilt.
+
+* Mon Jul  2 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Created seperate RPM and DEB packages for MonetDB/JAQL.
+
+* Fri Jun 29 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- sql: COPY INTO now accepts optional parenthesis for file argument.
+  Binary COPY INTO now requires 'COPY BINARY INTO'.
+
+* Fri Jun 29 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- clients: ODBC: Fixed a bug where SQLNativeSql expected a statment handle 
instead
+  of a connection handle.
+
+* Thu Jun 14 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- monetdb5: Crackers code has been removed.  Development continues in the 
holindex
+  branch.
+
+* Wed Jun 13 2012 Fabian Groffen fab...@cwi.nl - 11.11.1-20120706
+- merovingian: Removed erroneously (re-)added master and slave properties, this
+  functionality is currently not working.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Removed --enable-bits option from configure.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- buildtools: Split the MonetDB-client-ruby RPM package into two and named 
them in
+  accordance with the Fedora packaging guidelines as rubygem-gem-name.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- gdk: The sorted property, which was used to maintain whether a column in
+  a BAT was sorted or reverse sorted, has been replaced by a pair of
+  properties, sorted and revsorted.  These new properties can be set
+  independently (unlike the old sorted property), and so if both are set,
+  the column must be constant.  In addition, internal property checking
+  has been overhauled.  Now, when a property is set incorrectly, and
+  when assertions are enabled, an assertion will go off.  There is also
+  a function which can derive properties.
+
+* Thu Jun  7 2012 Sjoerd Mullender sjo...@acm.org - 11.11.1-20120706
+- gdk: Implemented proper overflow checking on all arithmetic operations.
+
 * Thu Jun 07 2012

MonetDB: Jul2012 - fixed bugs 3113 and 3114

2012-07-06 Thread Niels Nes 
Changeset: 03516346b4d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03516346b4d5
Added Files:
sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.sql
sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err
sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.out
sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.sql
sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.err
sql/test/BugTracker-2012/Tests/index_column_crash.Bug-3113.stable.out
Modified Files:
sql/server/rel_bin.c
sql/server/rel_updates.c
sql/test/BugTracker-2012/Tests/All
Branch: Jul2012
Log Message:

fixed bugs 3113 and 3114

3113: single column indices aren't stored, ie don't have updates

3114: properly use the update 'column expression' instead of the original
column expression.


diffs (truncated from 302 to 300 lines):

diff --git a/sql/server/rel_bin.c b/sql/server/rel_bin.c
--- a/sql/server/rel_bin.c
+++ b/sql/server/rel_bin.c
@@ -2179,10 +2179,8 @@ rel2bin_project( mvc *sql, sql_rel *rel,
psub = stmt_list(sql-sa, pl);
for( en = rel-exps-h; en; en = en-next ) {
sql_exp *exp = en-data;
-   stmt *s = exp_bin(sql, exp, sub, NULL, NULL, NULL);
-
-   if (!s)
-   s = exp_bin(sql, exp, sub, psub, NULL, NULL);
+   stmt *s = exp_bin(sql, exp, sub, psub, NULL, NULL);
+
if (!s) {
assert(0);
return NULL;
@@ -3879,7 +3877,8 @@ rel2bin_update( mvc *sql, sql_rel *rel, 
if (i) {
stmt *is = bin_find_column(sql-sa, update, ce-l, 
ce-r);
 
-   is = stmt_join(sql-sa, stmt_reverse(sql-sa, tid), is, 
cmp_equal);
+   if (is)
+   is = stmt_join(sql-sa, stmt_reverse(sql-sa, 
tid), is, cmp_equal);
if ((hash_index(i-type)  list_length(i-columns) = 
1) || i-type == no_idx)
is = NULL;
if (i-key) {
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -619,7 +619,7 @@ rel_update_join_idx(mvc *sql, sql_idx *i
 
sql_rel *_nlls = NULL, *nnlls, *ups = updates-r;
sql_exp *lnll_exps = NULL, *rnll_exps = NULL, *e;
-   list *join_exps = new_exp_list(sql-sa);
+   list *join_exps = new_exp_list(sql-sa), *pexps;
 
for (m = i-columns-h; m; m = m-next) {
sql_kc *c = m-data;
@@ -668,9 +668,10 @@ rel_update_join_idx(mvc *sql, sql_idx *i
nnlls = ups;
}
 
+   pexps = rel_projections(sql, nnlls, NULL, 1, 1);
nnlls = rel_crossproduct(sql-sa, nnlls, rt, op_join);
nnlls-exps = join_exps;
-   nnlls = rel_project(sql-sa, nnlls, rel_projections(sql, nnlls-l, 
NULL, 1, 1));
+   nnlls = rel_project(sql-sa, nnlls, pexps);
/* add row numbers */
e = exp_column(sql-sa, rel_name(rt), %TID%, 
sql_bind_localtype(oid), CARD_MULTI, 0, 1);
exp_setname(sql-sa, e, i-t-base.name, iname);
diff --git a/sql/test/BugTracker-2012/Tests/All 
b/sql/test/BugTracker-2012/Tests/All
--- a/sql/test/BugTracker-2012/Tests/All
+++ b/sql/test/BugTracker-2012/Tests/All
@@ -45,3 +45,5 @@ hash_join_crash.Bug-3089
 row-number-nyi.Bug-3087
 insert_serial_with_unique_key.Bug-3091
 with_and_exists.Bug-3099
+index_column_crash.Bug-3113
+foreign_key.Bug-3114
diff --git a/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.sql 
b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.sql
@@ -0,0 +1,25 @@
+
+CREATE TABLE sys.first (
+id intNOT NULL,
+CONSTRAINT first_id_pkey PRIMARY KEY (id)
+);
+
+CREATE TABLE sys.second (
+id  int   NOT NULL,
+ref int,
+CONSTRAINT second_id_pkey PRIMARY KEY (id),
+CONSTRAINT second_ref_fkey FOREIGN KEY
+(ref) REFERENCES sys.first (id)
+);
+
+insert into second values (100, null);
+insert into second values (101, 1);
+
+update second set ref = 1 WHERE id = 100;
+update second set ref = null WHERE id = 100;
+
+insert into first values (200);
+update second set ref = 1 WHERE id = 100;
+
+drop table second;
+drop table first;
diff --git a/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err 
b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err
@@ -0,0 +1,46 @@
+stderr of test 'foreign_key.Bug-3114` in directory 'test/BugTracker-2012` 
itself:
+
+
+# 17:09:13   
+# 17:09:13   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB --set 
mapi_open=true --set mapi_port=34838 --set monet_prompt= --trace

MonetDB: Jul2012 - merging

2012-07-06 Thread Niels Nes 
Changeset: f48dc0895f4d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f48dc0895f4d
Modified Files:
monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/insert_queue.sql
Branch: Jul2012
Log Message:

merging


diffs (73 lines):

diff --git a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal 
b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
--- a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
+++ b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
@@ -16,6 +16,4 @@
 # All Rights Reserved.
 
 # This loads the opt_sql_append optimizer module
-library opt_sql_append;
 include opt_sql_append;
-
diff --git a/sql/test/ssqq/Tests/insert_query.stable.out 
b/sql/test/ssqq/Tests/insert_query.stable.out
--- a/sql/test/ssqq/Tests/insert_query.stable.out
+++ b/sql/test/ssqq/Tests/insert_query.stable.out
@@ -85,7 +85,7 @@ Ready.
 % single_value # name
 % int # type
 % 1 # length
-[ 4]
+[ 3]
 #select * from quser;
 % sys.quser,   sys.quser,  sys.quser,  sys.quser,  sys.quser,  
sys.quser # table_name
 % quser_id,user_name,  uid,emailaddress,   password,   enabled 
# name
@@ -100,7 +100,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select * from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_add,  queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
diff --git a/sql/test/ssqq/Tests/insert_queue.stable.out 
b/sql/test/ssqq/Tests/insert_queue.stable.out
--- a/sql/test/ssqq/Tests/insert_queue.stable.out
+++ b/sql/test/ssqq/Tests/insert_queue.stable.out
@@ -39,7 +39,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select queue_id, query_id, queue_number, os_version, monetdb_version, 
start_query, query_ready from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
@@ -102,7 +102,7 @@ Ready.
 % 1,   1,  21, 1,  5,  5,  0,  1,  0,  0 # 
length
 [ 1,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 [ 2,   1,  select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
-[ 4,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
+[ 3,   NULL,   select * from example,0,  NULL,   NULL,   NULL,   
NULL,   NULL,   NULL]
 #select queue_id, query_id, queue_number, os_version, monetdb_version, 
start_query, query_ready from queue;
 % sys.queue,   sys.queue,  sys.queue,  sys.queue,  sys.queue,  
sys.queue,  sys.queue # table_name
 % queue_id,query_id,   queue_number,   os_version, 
monetdb_version,start_query,query_ready # name
@@ -110,7 +110,7 @@ Ready.
 % 1,   1,  1,  5,  5,  26, 26 # length
 [ 1,   1,  0,  monet,linux,NULL,   NULL]
 [ 3,   2,  0,  monet,linux,NULL,   NULL]
-[ 4,   4,  0,  monet,linux,NULL,   NULL]
+[ 4,   3,  0,  monet,linux,NULL,   NULL]
 
 # 13:39:03   
 # 13:39:03   Done.
diff --git a/sql/test/ssqq/insert_queue.sql b/sql/test/ssqq/insert_queue.sql
--- a/sql/test/ssqq/insert_queue.sql
+++ b/sql/test/ssqq/insert_queue.sql
@@ -32,7 +32,7 @@ select queue_id, query_id, queue_number,
 
 set id_result = -1;
 
-set id_result = insert_queue(4, 'monet', 'linux');
+set id_result = insert_queue(3, 'monet', 'linux');
 
 select id_result;
 
___
Checkin-list mailing list
Checkin-list@monetdb.org

MonetDB: Jul2012 - fix crash in BATconst

2012-07-06 Thread Niels Nes 
Changeset: 2ee642457e66 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ee642457e66
Modified Files:
gdk/gdk_batop.mx
Branch: Jul2012
Log Message:

fix crash in BATconst


diffs (15 lines):

diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -2763,8 +2763,10 @@ BATconst(BAT *b, int tailtype, const voi
bn = VIEWcreate(b, bt);
BBPunfix(bt-batCacheid);
}
-   if (b != o)
+   if (b != o) {
BBPunfix(b-batCacheid);
+   b = o;
+   }
}
} else {
if (tailtype == TYPE_bat) {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list