MonetDB: default - merge with Jun2010 branch

2010-08-19 Thread Stefan Manegold 
Changeset: fa4a6f5a4666 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa4a6f5a4666
Modified Files:

Branch: default
Log Message:

merge with Jun2010 branch


diffs (10 lines):

diff -r 81c33e1c5e34 -r fa4a6f5a4666 
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
--- a/sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py 
Thu Aug 19 22:13:03 2010 +0200
+++ b/sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py 
Fri Aug 20 08:46:58 2010 +0200
@@ -6,3 +6,6 @@
  os.path.pardir,
  'insert-null-byte.sql')))
 c.communicate()
+
+c = process.client('sql', stdin = process.PIPE)
+c.communicate('drop table strings2233581;')
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - clean-up created table to make subsequent tes...

2010-08-19 Thread Stefan Manegold 
Changeset: d0b2650890d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0b2650890d7
Modified Files:
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
Branch: Jun2010
Log Message:

clean-up created table to make subsequent tests independent of this one


diffs (10 lines):

diff -r 1d1fd5e68238 -r d0b2650890d7 
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py
--- a/sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py 
Thu Aug 19 22:02:01 2010 +0200
+++ b/sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.py 
Fri Aug 20 08:45:58 2010 +0200
@@ -6,3 +6,6 @@
  os.path.pardir,
  'insert-null-byte.sql')))
 c.communicate()
+
+c = process.client('sql', stdin = process.PIPE)
+c.communicate('drop table strings2233581;')
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge with Jun2010 branch

2010-08-19 Thread Stefan Manegold 
Changeset: 81c33e1c5e34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81c33e1c5e34
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/MonetDB-SQL.spec
sql/src/server/rel_select.mx
sql/src/test/BugTracker-2010/Tests/All
testing/MonetDB-testing.spec
Branch: default
Log Message:

merge with Jun2010 branch


diffs (truncated from 451 to 300 lines):

diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec  Thu Aug 19 18:05:43 2010 +0200
+++ b/MonetDB/MonetDB.spec  Thu Aug 19 22:13:03 2010 +0200
@@ -143,9 +143,9 @@
 * Tue Apr 20 2010 Stefan Manegold  - 1.38.1-20100618
 - Implemented build directory support for Windows, i.e., like on
   Unix/Linux also on Windows we can now build in a separate build
-  directory as alternative to ...NT, and thus keep the latter
+  directory as alternative to ...\\NT, and thus keep the latter
   clean from files generated during the build.  On Windows, the build
-  directory must be a sibling of ...NT .
+  directory must be a sibling of ...\\NT .
 
 * Tue Apr 20 2010 Sjoerd Mullender  - 1.36.5-20100420
 - Rebuilt.
diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Thu Aug 19 18:05:43 2010 +0200
+++ b/MonetDB/debian/changelog  Thu Aug 19 22:13:03 2010 +0200
@@ -63,9 +63,9 @@
 
   * Implemented build directory support for Windows, i.e., like on
 Unix/Linux also on Windows we can now build in a separate build
-directory as alternative to ...NT, and thus keep the
+directory as alternative to ...\\NT, and thus keep the
 latter clean from files generated during the build.  On Windows,
-the build directory must be a sibling of ...NT .
+the build directory must be a sibling of ...\\NT .
 
  -- Stefan Manegold   Tue, 20 Apr 2010 10:58:37 +0200
 
diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec  Thu Aug 19 18:05:43 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec  Thu Aug 19 22:13:03 2010 +0200
@@ -254,9 +254,9 @@
 * Tue Apr 20 2010 Stefan Manegold  - 4.38.1-20100618
 - Implemented build directory support for Windows, i.e., like on
   Unix/Linux also on Windows we can now build in a separate build
-  directory as alternative to ...NT, and thus keep the latter
+  directory as alternative to ...\\NT, and thus keep the latter
   clean from files generated during the build.  On Windows, the build
-  directory must be a sibling of ...NT .
+  directory must be a sibling of ...\\NT .
 
 * Tue Apr 20 2010 Sjoerd Mullender  - 4.36.5-20100420
 - Rebuilt.
diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Thu Aug 19 18:05:43 2010 +0200
+++ b/MonetDB4/debian/changelog Thu Aug 19 22:13:03 2010 +0200
@@ -63,9 +63,9 @@
 
   * Implemented build directory support for Windows, i.e., like on
 Unix/Linux also on Windows we can now build in a separate build
-directory as alternative to ...NT, and thus keep the
+directory as alternative to ...\\NT, and thus keep the
 latter clean from files generated during the build.  On Windows,
-the build directory must be a sibling of ...NT .
+the build directory must be a sibling of ...\\NT .
 
  -- Stefan Manegold   Tue, 20 Apr 2010 10:58:37 +0200
 
diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec  Thu Aug 19 18:05:43 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec  Thu Aug 19 22:13:03 2010 +0200
@@ -288,9 +288,9 @@
 * Tue Apr 20 2010 Stefan Manegold  - 5.20.1-20100618
 - Implemented build directory support for Windows, i.e., like on
   Unix/Linux also on Windows we can now build in a separate build
-  directory as alternative to ...NT, and thus keep the latter
+  directory as alternative to ...\\NT, and thus keep the latter
   clean from files generated during the build.  On Windows, the build
-  directory must be a sibling of ...NT .
+  directory must be a sibling of ...\\NT .
 
 * Tue Apr 20 2010 Martin Kersten  - 5.20.1-20100618
 - The MAL debugger list command has been extended with an optional
diff -r 453efd75f1a2 -r 81c33e1c5e34 MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Thu Aug 19 18:05:43 2010 +0200
+++ b/MonetDB5/debian/changelog Thu Aug 19 22:13:03 2010 +0200
@@ -122,9 +122,9 @@
 
   * Implemented build directory support for Windows, i.e., like on
 Unix/Linux also on Windows we can now build in a separate build
-directory as alternative to ...NT, and thus keep the
+directory as alternative to ...\\NT, and thus keep the
 latter clean from files generated during the build.  On Windows,
-the build directory must be a sibling of ...NT .
+the build directory must be a sibling of ...\\NT .
 
  -- Stefan Manegold   Tue,

MonetDB: Jun2010 - adjusted some more timeouts

2010-08-19 Thread Stefan Manegold 
Changeset: 1d1fd5e68238 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d1fd5e68238
Modified Files:

sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.timeout
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.timeout
sql/src/test/BugTracker/Tests/with_row_number.SF-1898089.timeout
Branch: Jun2010
Log Message:

adjusted some more timeouts


diffs (17 lines):

diff -r 4f07bf24bc9a -r 1d1fd5e68238 
sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.timeout
--- 
a/sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.timeout 
Thu Aug 19 21:52:14 2010 +0200
+++ 
b/sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.timeout 
Thu Aug 19 22:02:01 2010 +0200
@@ -1,1 +1,1 @@
-9
+4
diff -r 4f07bf24bc9a -r 1d1fd5e68238 
sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.timeout
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/error-truncated.Bug-2615.timeout   
Thu Aug 19 22:02:01 2010 +0200
@@ -0,0 +1,1 @@
+2
diff -r 4f07bf24bc9a -r 1d1fd5e68238 
sql/src/test/BugTracker/Tests/with_row_number.SF-1898089.timeout
--- a/sql/src/test/BugTracker/Tests/with_row_number.SF-1898089.timeout  Thu Aug 
19 21:52:14 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/with_row_number.SF-1898089.timeout  Thu Aug 
19 22:02:01 2010 +0200
@@ -1,1 +1,1 @@
-2
+3
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - (re-?) added missing (lost?) "\" in Windows p...

2010-08-19 Thread Stefan Manegold 
Changeset: 4f07bf24bc9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4f07bf24bc9a
Modified Files:
MonetDB/MonetDB.spec
MonetDB/debian/changelog
MonetDB4/MonetDB-server.spec
MonetDB4/debian/changelog
MonetDB5/MonetDB-server.spec
MonetDB5/debian/changelog
buildtools/ChangeLog.Jun2010
clients/MonetDB-client.spec
clients/debian/changelog
geom/MonetDB-geom.spec
geom/debian/changelog
java/ChangeLog.Jun2010
pathfinder/MonetDB-XQuery.spec
pathfinder/debian/changelog
sql/MonetDB-SQL.spec
sql/debian/changelog
template/ChangeLog.Jun2010
testing/MonetDB-testing.spec
testing/debian/changelog
Branch: Jun2010
Log Message:

(re-?) added missing (lost?) "\" in Windows paths in (old) ChnageLog messages


diffs (279 lines):

diff -r f63520ed7cb9 -r 4f07bf24bc9a MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec  Thu Aug 19 18:33:09 2010 +0200
+++ b/MonetDB/MonetDB.spec  Thu Aug 19 21:52:14 2010 +0200
@@ -143,9 +143,9 @@
 * Tue Apr 20 2010 Stefan Manegold  - 1.38.1-20100618
 - Implemented build directory support for Windows, i.e., like on
   Unix/Linux also on Windows we can now build in a separate build
-  directory as alternative to ...NT, and thus keep the latter
+  directory as alternative to ...\\NT, and thus keep the latter
   clean from files generated during the build.  On Windows, the build
-  directory must be a sibling of ...NT .
+  directory must be a sibling of ...\\NT .
 
 * Tue Apr 20 2010 Sjoerd Mullender  - 1.36.5-20100420
 - Rebuilt.
diff -r f63520ed7cb9 -r 4f07bf24bc9a MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Thu Aug 19 18:33:09 2010 +0200
+++ b/MonetDB/debian/changelog  Thu Aug 19 21:52:14 2010 +0200
@@ -63,9 +63,9 @@
 
   * Implemented build directory support for Windows, i.e., like on
 Unix/Linux also on Windows we can now build in a separate build
-directory as alternative to ...NT, and thus keep the
+directory as alternative to ...\\NT, and thus keep the
 latter clean from files generated during the build.  On Windows,
-the build directory must be a sibling of ...NT .
+the build directory must be a sibling of ...\\NT .
 
  -- Stefan Manegold   Tue, 20 Apr 2010 10:58:37 +0200
 
diff -r f63520ed7cb9 -r 4f07bf24bc9a MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec  Thu Aug 19 18:33:09 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec  Thu Aug 19 21:52:14 2010 +0200
@@ -254,9 +254,9 @@
 * Tue Apr 20 2010 Stefan Manegold  - 4.38.1-20100618
 - Implemented build directory support for Windows, i.e., like on
   Unix/Linux also on Windows we can now build in a separate build
-  directory as alternative to ...NT, and thus keep the latter
+  directory as alternative to ...\\NT, and thus keep the latter
   clean from files generated during the build.  On Windows, the build
-  directory must be a sibling of ...NT .
+  directory must be a sibling of ...\\NT .
 
 * Tue Apr 20 2010 Sjoerd Mullender  - 4.36.5-20100420
 - Rebuilt.
diff -r f63520ed7cb9 -r 4f07bf24bc9a MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Thu Aug 19 18:33:09 2010 +0200
+++ b/MonetDB4/debian/changelog Thu Aug 19 21:52:14 2010 +0200
@@ -63,9 +63,9 @@
 
   * Implemented build directory support for Windows, i.e., like on
 Unix/Linux also on Windows we can now build in a separate build
-directory as alternative to ...NT, and thus keep the
+directory as alternative to ...\\NT, and thus keep the
 latter clean from files generated during the build.  On Windows,
-the build directory must be a sibling of ...NT .
+the build directory must be a sibling of ...\\NT .
 
  -- Stefan Manegold   Tue, 20 Apr 2010 10:58:37 +0200
 
diff -r f63520ed7cb9 -r 4f07bf24bc9a MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec  Thu Aug 19 18:33:09 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec  Thu Aug 19 21:52:14 2010 +0200
@@ -289,9 +289,9 @@
 * Tue Apr 20 2010 Stefan Manegold  - 5.20.1-20100618
 - Implemented build directory support for Windows, i.e., like on
   Unix/Linux also on Windows we can now build in a separate build
-  directory as alternative to ...NT, and thus keep the latter
+  directory as alternative to ...\\NT, and thus keep the latter
   clean from files generated during the build.  On Windows, the build
-  directory must be a sibling of ...NT .
+  directory must be a sibling of ...\\NT .
 
 * Tue Apr 20 2010 Martin Kersten  - 5.20.1-20100618
 - The MAL debugger list command has been extended with an optional
diff -r f63520ed7cb9 -r 4f07bf24bc9a MonetDB5/debian/changelog
--- a/MonetDB5/debian/changelog Thu Aug 19 18:33:09 2010 +0200
+++ b/MonetDB5/debian/changelog Thu Aug 19 21:52:14 2010 +0200
@@ -122,9 +122,9 @@
 
   * Implemented build directory support for Windows, i.e., like on
 Unix/Linux also on Windows we can now build in a separate build
-directory a

MonetDB: Jun2010 - added test for Bug 2604

2010-08-19 Thread Niels Nes 
Changeset: f63520ed7cb9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f63520ed7cb9
Modified Files:
sql/src/test/BugTracker-2010/Tests/All
sql/src/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.sql
sql/src/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.stable.err
sql/src/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.stable.out
Branch: Jun2010
Log Message:

added test for Bug 2604


diffs (143 lines):

diff -r 2565be77974c -r f63520ed7cb9 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllThu Aug 19 18:27:34 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllThu Aug 19 18:33:09 2010 +0200
@@ -50,3 +50,4 @@
 crash_in_dce.Bug-2651
 in_query_missing_columns.Bug-2652
 sum_on_date_crash.Bug-2643
+crash_on_in_2.Bug-2604
diff -r 2565be77974c -r f63520ed7cb9 
sql/src/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.sql
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.sql Thu Aug 
19 18:33:09 2010 +0200
@@ -0,0 +1,5 @@
+create table t1 (a int);
+select * from t1;
+select * from t2;
+select * from t1 where a in (select b from t2);
+drop table t1;
diff -r 2565be77974c -r f63520ed7cb9 
sql/src/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.stable.err
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/crash_on_in_2.Bug-2604.stable.err  
Thu Aug 19 18:33:09 2010 +0200
@@ -0,0 +1,80 @@
+stderr of test 'crash_on_in_2.Bug-2604` in directory 
'src/test/BugTracker-2010` itself:
+
+
+# 18:31:06 >  
+# 18:31:06 >   mserver5 
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 
--set gdk_nr_threads=0 --set 
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"  
--set mapi_open=true --set xrpc_open=true --set mapi_port=34141 --set 
xrpc_port=48574 --set monet_prompt= --set mal_listing=2 --trace  
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo 
Over..
+# 18:31:06 >  
+
+# builtin opt  gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt  gdk_version = 1.38.4
+# builtin opt  prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# builtin opt  exec_prefix = ${prefix}
+# builtin opt  gdk_dbname = demo
+# builtin opt  gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_alloc_map = no
+# builtin opt  gdk_vmtrim = yes
+# builtin opt  monet_admin = adm
+# builtin opt  monet_prompt = >
+# builtin opt  monet_welcome = yes
+# builtin opt  monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt  monet_daemon = no
+# builtin opt  host = localhost
+# builtin opt  mapi_port = 5
+# builtin opt  mapi_clients = 2
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_debug = 0
+# builtin opt  standoff_ns = 
+# builtin opt  standoff_start = start
+# builtin opt  standoff_end = end
+# config opt   prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt   config = ${prefix}/etc/monetdb5.conf
+# config opt   prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt   exec_prefix = ${prefix}
+# config opt   gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt   monet_mod_path = 
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt   mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt   mero_controlport = 50001
+# config opt   sql_optimizer = default_pipe
+# config opt   minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt   default_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt   nov2009_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt   accumulator_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt   recycler_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt   cracker_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt   sidcrack_pipe = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# c

MonetDB: Jun2010 - check for return values properly (should solv...

2010-08-19 Thread Niels Nes 
Changeset: 2565be77974c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2565be77974c
Modified Files:
sql/src/server/rel_select.mx
Branch: Jun2010
Log Message:

check for return values properly (should solve bug 2604)


diffs (12 lines):

diff -r a97e56a7649c -r 2565be77974c sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx  Thu Aug 19 17:49:56 2010 +0200
+++ b/sql/src/server/rel_select.mx  Thu Aug 19 18:27:34 2010 +0200
@@ -2657,7 +2657,7 @@
/* TODO remove null checking (not 
needed in correlated case because of the semi/anti join) ! */
rel = left = rel_dup(left);
r = rel_value_exp(sql, &rel, sval, f, 
ek);
-   if (!is_project(rel->op)) {
+   if (r && !is_project(rel->op)) {
rel = rel_project(rel, NULL);
rel_project_add_exp(sql, rel, 
r);
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merge

2010-08-19 Thread Niels Nes 
Changeset: 453efd75f1a2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=453efd75f1a2
Modified Files:
sql/src/backends/monet5/sql_optimizer.mx
sql/src/server/rel_optimizer.mx
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.bat
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.sh
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.bat
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.sh

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.sql

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.stable.err

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.stable.out

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.sql

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.stable.err

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.stable.out

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.sql

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.stable.err

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.stable.out

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.sql

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.stable.err

sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.stable.out
sql/src/test/Tests/like_tests.SQL.bat
sql/src/test/Tests/like_tests.SQL.sh
sql/src/test/Tests/null-byte-hang.SQL.bat
sql/src/test/Tests/null-byte-hang.SQL.sh
sql/src/test/Tests/zones2.SQL.bat
sql/src/test/Tests/zones2.SQL.sh
Branch: default
Log Message:

merge


diffs (truncated from 11017 to 300 lines):

diff -r 32ef46b52453 -r 453efd75f1a2 
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj   Thu Aug 19 18:05:06 
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj   Thu Aug 19 18:05:43 
2010 +0200
@@ -187,7 +187,7 @@
 {
 
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F567DEF0CA64069BF1409C4AC7228E3"
 {
-"SourcePath" = "8:C:\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
+"SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
 "TargetName" = "8:libbz2.dll"
 "Tag" = "8:"
 "Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -227,7 +227,7 @@
 }
 
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29FE781523A94CBDA5CD53F7A319B4D8"
 {
-"SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\ssleay32.dll"
+"SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll"
 "TargetName" = "8:ssleay32.dll"
 "Tag" = "8:"
 "Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
 }
 
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
 {
-"SourcePath" = "8:C:\\zlib-1.2.3.win32\\bin\\zlib1.dll"
+"SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
 "TargetName" = "8:zlib1.dll"
 "Tag" = "8:"
 "Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -287,7 +287,7 @@
 }
 
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_926BCA1A727C4F29B3DA99D425D895EA"
 {
-"SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\libeay32.dll"
+"SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll"
 "TargetName" = "8:libeay32.dll"
 "Tag" = "8:"
 "Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -307,7 +307,7 @@
 }
 
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BB4791ABAA4349E4A0DE1EDA0772E622"
 {
-"SourcePath" = "8:C:\\pthreads\\lib\\pthreadVC2.dll"
+"SourcePath" = "8:C:\\Libraries\\Pthreads\\lib\\pthreadVC2.dll"
 "TargetName" = "8:pthreadVC2.dll"
 "Tag" = "8:"
 "Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -447,7 +447,7 @@
 }
 
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614"
 {
-"SourcePath" = "8:C:\\iconv-1.11.1.wi

MonetDB: default - comment about future work

2010-08-19 Thread Niels Nes 
Changeset: 32ef46b52453 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32ef46b52453
Modified Files:
sql/src/server/rel_optimizer.mx
Branch: default
Log Message:

comment about future work


diffs (19 lines):

diff -r e0562ba062d9 -r 32ef46b52453 sql/src/server/rel_optimizer.mx
--- a/sql/src/server/rel_optimizer.mx   Thu Aug 19 18:04:27 2010 +0200
+++ b/sql/src/server/rel_optimizer.mx   Thu Aug 19 18:05:06 2010 +0200
@@ -3735,6 +3735,15 @@
 }
 #endif
 
+   /* TODO
+   expensive (functions) in select and/or join expressions should
+   be push-up into new projections after (ie executed when the
+   tables are reduced allready).
+
+   select bla = true/false should be rewriten into select bla.
+   and not(bla).
+   (were bla is an compare expression)
+   */
/* make parts conditional (via debug flag) */
 
/* simple merging of projects */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - only keep minmax on readonly bats

2010-08-19 Thread Niels Nes 
Changeset: e0562ba062d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0562ba062d9
Modified Files:
sql/src/storage/bat/bat_storage.mx
Branch: default
Log Message:

only keep minmax on readonly bats


diffs (20 lines):

diff -r 10dde6a52182 -r e0562ba062d9 sql/src/storage/bat/bat_storage.mx
--- a/sql/src/storage/bat/bat_storage.mxFri Aug 13 00:59:29 2010 +0200
+++ b/sql/src/storage/bat/bat_storage.mxThu Aug 19 18:04:27 2010 +0200
@@ -1316,10 +1316,12 @@
int ok = LOG_OK;
node *n;
 
-   for (n = t->columns.set->h; ok == LOG_OK && n; n = n->next) {
-   sql_column *c = n->data;
-
-   ok = gtr_minmax_col(tr, c);
+   if (t->readonly) {
+   for (n = t->columns.set->h; ok == LOG_OK && n; n = n->next) {
+   sql_column *c = n->data;
+   
+   ok = gtr_minmax_col(tr, c);
+   }
}
return ok;
 }
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - fix crash in optimizer. Fixes bug 2653

2010-08-19 Thread Niels Nes 
Changeset: 10dde6a52182 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10dde6a52182
Modified Files:
sql/src/backends/monet5/sql_optimizer.mx
Branch: default
Log Message:

fix crash in optimizer. Fixes bug2653


diffs (18 lines):

diff -r 8163b954a9fa -r 10dde6a52182 sql/src/backends/monet5/sql_optimizer.mx
--- a/sql/src/backends/monet5/sql_optimizer.mx  Mon Aug 09 10:01:06 2010 +0200
+++ b/sql/src/backends/monet5/sql_optimizer.mx  Fri Aug 13 00:59:29 2010 +0200
@@ -333,14 +333,8 @@
int k = getArg(p,0);
sql_bpm *bpm = NULL;
sql_schema *s = mvc_bind_schema(m, sname);
-   mvc *m = NULL;
-#ifndef NDEBUG
-   str msg = getContext(cntxt,mb, &m, NULL);
-#endif
BAT *b;
 
-   assert(msg == MAL_SUCCEED);
-
if (!s || strcmp(s->base.name, dt_schema) == 0) {
pushInstruction(mb,p);
continue;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge: Added some belated changelog messages.

2010-08-19 Thread Sjoerd Mullender 
Changeset: db5ef78c155a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db5ef78c155a
Modified Files:
sql/ChangeLog.Jun2010
Branch: default
Log Message:

Merge: Added some belated changelog messages.


diffs (30 lines):

diff -r 1ae7d5c90635 -r db5ef78c155a MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Thu Aug 19 17:09:48 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Thu Aug 19 17:50:22 2010 +0200
@@ -1,6 +1,10 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Thu Aug 19 2010 Sjoerd Mullender 
+- If extensions such as SQL and GEOM are properly installed, they are
+  loaded automatically when mserver5 starts.  This fixes bug 2522.
+
 * Fri Jul 30 2010 Niels Nes 
 - Fixed bug 2557. There was a bug in the mergetable optimizer which was
   triggered by multi column (at least 32 columns).
diff -r 1ae7d5c90635 -r db5ef78c155a sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Thu Aug 19 17:09:48 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Thu Aug 19 17:50:22 2010 +0200
@@ -1,6 +1,12 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Thu Aug 19 2010 Sjoerd Mullender 
+- A bug was fixed where updates were missing in large transaction.
+  This fixes bug 2543.
+- A memory leak was fixed which caused the server to grow when loading
+  and emptying a table.  This was bug 2539.
+
 * Fri Aug 13 2010 Niels Nes 
 - Fixed bug 2643 added more defensive code, when an aggregation function
   doesn't exist
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - Added some belated changelog messages.

2010-08-19 Thread Sjoerd Mullender 
Changeset: a97e56a7649c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a97e56a7649c
Modified Files:
MonetDB5/ChangeLog.Jun2010
sql/ChangeLog.Jun2010
Branch: Jun2010
Log Message:

Added some belated changelog messages.


diffs (30 lines):

diff -r 2a84a23812d4 -r a97e56a7649c MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Thu Aug 19 17:09:12 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Thu Aug 19 17:49:56 2010 +0200
@@ -1,6 +1,10 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Thu Aug 19 2010 Sjoerd Mullender 
+- If extensions such as SQL and GEOM are properly installed, they are
+  loaded automatically when mserver5 starts.  This fixes bug 2522.
+
 * Fri Jul 30 2010 Niels Nes 
 - Fixed bug 2557. There was a bug in the mergetable optimizer which was
   triggered by multi column (at least 32 columns).
diff -r 2a84a23812d4 -r a97e56a7649c sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Thu Aug 19 17:09:12 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Thu Aug 19 17:49:56 2010 +0200
@@ -1,6 +1,12 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Thu Aug 19 2010 Sjoerd Mullender 
+- A bug was fixed where updates were missing in large transaction.
+  This fixes bug 2543.
+- A memory leak was fixed which caused the server to grow when loading
+  and emptying a table.  This was bug 2539.
+
 * Fri Aug 13 2010 Niels Nes 
 - Fixed bug 2643 added more defensive code, when an aggregation function
   doesn't exist
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge: Cleaned up some old changelog entries.

2010-08-19 Thread Sjoerd Mullender 
Changeset: 1ae7d5c90635 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ae7d5c90635
Modified Files:
clients/MonetDB-client.spec
sql/MonetDB-SQL.spec
Branch: default
Log Message:

Merge: Cleaned up some old changelog entries.


diffs (truncated from 794 to 300 lines):

diff -r c82c3ed30d79 -r 1ae7d5c90635 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Thu Aug 19 15:19:33 2010 +0200
+++ b/MonetDB/debian/changelog  Thu Aug 19 17:09:48 2010 +0200
@@ -49,23 +49,23 @@
 monetdb (1.38.1-20100618) unstable; urgency=low
 
   * Made compilation of "testing" (and "java") independent of MonetDB.
-This is mainly for Windows, but also on other systems, "testing" can now be
-built independently of (and hence before) "MonetDB".
-Files that mimic configure functionality on Windows were moved from
-"MonetDB" to "buildtools"; hence, this affects all packages on Windows,
-requiring a complete rebuild from scratch on Windows.
-getopt() support in testing has changed; hence, (most probably) requiring a
-rebuild from scratch of testing on other systems.
+This is mainly for Windows, but also on other systems, "testing"
+can now be built independently of (and hence before) "MonetDB".
+Files that mimic configure functionality on Windows were moved
+from "MonetDB" to "buildtools"; hence, this affects all packages
+on Windows, requiring a complete rebuild from scratch on Windows.
+getopt() support in testing has changed; hence, (most probably)
+requiring a rebuild from scratch of testing on other systems.
 
  -- Stefan Manegold   Tue, 20 Apr 2010 10:58:37 +0200
 
 monetdb (1.38.1-20100618) unstable; urgency=low
 
-  * Implemented build directory support for Windows,
-i.e., like on Unix/Linux also on Windows we can now build in a separate
-build directory as alternative to ...NT, and thus keep the
-latter clean from files generated during the build.
-On Windows, the build directory must be a sibling of ...NT .
+  * Implemented build directory support for Windows, i.e., like on
+Unix/Linux also on Windows we can now build in a separate build
+directory as alternative to ...NT, and thus keep the
+latter clean from files generated during the build.  On Windows,
+the build directory must be a sibling of ...NT .
 
  -- Stefan Manegold   Tue, 20 Apr 2010 10:58:37 +0200
 
@@ -77,22 +77,23 @@
 
 monetdb (1.36.5-20100420) unstable; urgency=low
 
-  * Fixed a bug that could cause a crash when string BATs are combined.
-(SF bug 2947763.)
+  * Fixed a bug that could cause a crash when string BATs are
+combined.  (SF bug 2947763.)
 
  -- Sjoerd Mullender   Thu, 15 Apr 2010 10:46:13 +0200
 
 monetdb (1.36.5-20100420) unstable; urgency=low
 
-  * Fixed a potential file leak: under certain conditions, files in the
-database might not get deleted when they should (they would be
+  * Fixed a potential file leak: under certain conditions, files in
+the database might not get deleted when they should (they would be
 deleted when the server restarts).
 
  -- Niels Nes   Sun, 11 Apr 2010 10:46:13 +0200
 
 monetdb (1.36.5-20100420) unstable; urgency=low
 
-  * Fix regression introduced in Feb2010-SP1 causing UDP connections to 
malfunction, in particular affecting the stethoscope tool.
+  * Fix regression introduced in Feb2010-SP1 causing UDP connections
+to malfunction, in particular affecting the stethoscope tool.
 
  -- Fabian Groffen   Mon, 29 Mar 2010 10:46:13 +0200
 
@@ -104,7 +105,8 @@
 
 monetdb (1.36.3-20100322) unstable; urgency=low
 
-  * Fixed bug in UDP stream creation causing UDP connections to already
+  * Fixed bug in UDP stream creation causing UDP connections to
+already
 
  -- Fabian Groffen   Mon, 01 Mar 2010 11:35:46 +0100
 
@@ -117,18 +119,18 @@
 monetdb (1.36.1-20100223) unstable; urgency=low
 
   * Various concurrency bugs were fixed.
-  * Various changes were made to run better on systems that don't have enough
-memory to keep everything in core that was touched during query processing.
-This is done by having the higher layers giving hints to the database
-kernel about future use, and the database kernel giving hings to the
-operating system kernel about how (virtual) memory is going to be used.
+  * Various changes were made to run better on systems that don't have
+enough memory to keep everything in core that was touched during
+query processing.  This is done by having the higher layers giving
+hints to the database kernel about future use, and the database
+kernel giving hings to the operating system kernel about how
+(virtual) memory is going to be used.
 
  -- Sjoerd Mullender   Mon, 22 Feb 2010 15:14:34 +0100
 
 monetdb (1.36.1-20100223) unstable; urgency=low
 
-  * Fixed bug in mergejoin implementation.
-This fixes bug  #2952191.
+  * Fixed bug in mergejoin implementation.  This fixes bug #2952191.
 
  -- Stefan Manegold

MonetDB: Jun2010 - Cleaned up some old changelog entries.

2010-08-19 Thread Sjoerd Mullender 
Changeset: 2a84a23812d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a84a23812d4
Modified Files:
MonetDB/debian/changelog
MonetDB4/debian/changelog
MonetDB5/debian/changelog
clients/MonetDB-client.spec
clients/debian/changelog
geom/debian/changelog
pathfinder/debian/changelog
sql/MonetDB-SQL.spec
sql/debian/changelog
Branch: Jun2010
Log Message:

Cleaned up some old changelog entries.


diffs (truncated from 794 to 300 lines):

diff -r f5c1caf71d65 -r 2a84a23812d4 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Thu Aug 19 14:30:36 2010 +0200
+++ b/MonetDB/debian/changelog  Thu Aug 19 17:09:12 2010 +0200
@@ -49,23 +49,23 @@
 monetdb (1.38.1-20100618) unstable; urgency=low
 
   * Made compilation of "testing" (and "java") independent of MonetDB.
-This is mainly for Windows, but also on other systems, "testing" can now be
-built independently of (and hence before) "MonetDB".
-Files that mimic configure functionality on Windows were moved from
-"MonetDB" to "buildtools"; hence, this affects all packages on Windows,
-requiring a complete rebuild from scratch on Windows.
-getopt() support in testing has changed; hence, (most probably) requiring a
-rebuild from scratch of testing on other systems.
+This is mainly for Windows, but also on other systems, "testing"
+can now be built independently of (and hence before) "MonetDB".
+Files that mimic configure functionality on Windows were moved
+from "MonetDB" to "buildtools"; hence, this affects all packages
+on Windows, requiring a complete rebuild from scratch on Windows.
+getopt() support in testing has changed; hence, (most probably)
+requiring a rebuild from scratch of testing on other systems.
 
  -- Stefan Manegold   Tue, 20 Apr 2010 10:58:37 +0200
 
 monetdb (1.38.1-20100618) unstable; urgency=low
 
-  * Implemented build directory support for Windows,
-i.e., like on Unix/Linux also on Windows we can now build in a separate
-build directory as alternative to ...NT, and thus keep the
-latter clean from files generated during the build.
-On Windows, the build directory must be a sibling of ...NT .
+  * Implemented build directory support for Windows, i.e., like on
+Unix/Linux also on Windows we can now build in a separate build
+directory as alternative to ...NT, and thus keep the
+latter clean from files generated during the build.  On Windows,
+the build directory must be a sibling of ...NT .
 
  -- Stefan Manegold   Tue, 20 Apr 2010 10:58:37 +0200
 
@@ -77,22 +77,23 @@
 
 monetdb (1.36.5-20100420) unstable; urgency=low
 
-  * Fixed a bug that could cause a crash when string BATs are combined.
-(SF bug 2947763.)
+  * Fixed a bug that could cause a crash when string BATs are
+combined.  (SF bug 2947763.)
 
  -- Sjoerd Mullender   Thu, 15 Apr 2010 10:46:13 +0200
 
 monetdb (1.36.5-20100420) unstable; urgency=low
 
-  * Fixed a potential file leak: under certain conditions, files in the
-database might not get deleted when they should (they would be
+  * Fixed a potential file leak: under certain conditions, files in
+the database might not get deleted when they should (they would be
 deleted when the server restarts).
 
  -- Niels Nes   Sun, 11 Apr 2010 10:46:13 +0200
 
 monetdb (1.36.5-20100420) unstable; urgency=low
 
-  * Fix regression introduced in Feb2010-SP1 causing UDP connections to 
malfunction, in particular affecting the stethoscope tool.
+  * Fix regression introduced in Feb2010-SP1 causing UDP connections
+to malfunction, in particular affecting the stethoscope tool.
 
  -- Fabian Groffen   Mon, 29 Mar 2010 10:46:13 +0200
 
@@ -104,7 +105,8 @@
 
 monetdb (1.36.3-20100322) unstable; urgency=low
 
-  * Fixed bug in UDP stream creation causing UDP connections to already
+  * Fixed bug in UDP stream creation causing UDP connections to
+already
 
  -- Fabian Groffen   Mon, 01 Mar 2010 11:35:46 +0100
 
@@ -117,18 +119,18 @@
 monetdb (1.36.1-20100223) unstable; urgency=low
 
   * Various concurrency bugs were fixed.
-  * Various changes were made to run better on systems that don't have enough
-memory to keep everything in core that was touched during query processing.
-This is done by having the higher layers giving hints to the database
-kernel about future use, and the database kernel giving hings to the
-operating system kernel about how (virtual) memory is going to be used.
+  * Various changes were made to run better on systems that don't have
+enough memory to keep everything in core that was touched during
+query processing.  This is done by having the higher layers giving
+hints to the database kernel about future use, and the database
+kernel giving hings to the operating system kernel about how
+(virtual) memory is going to be used.
 
  -- Sjoerd Mullender   Mon, 22 Feb 2010 15:14:34 +0100

MonetDB: default - also consider a decimal to be a numeric type ...

2010-08-19 Thread Fabian Groffen 
Changeset: c82c3ed30d79 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c82c3ed30d79
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:

also consider a decimal to be a numeric type (one that can't be squeezed)


diffs (13 lines):

diff -r 83b10c04d473 -r c82c3ed30d79 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Thu Aug 19 14:44:59 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Aug 19 15:19:33 2010 +0200
@@ -1141,7 +1141,8 @@
 strcmp(s, "wrd") == 0 ||
 strcmp(s, "smallint") == 0 ||
 strcmp(s, "double") == 0 ||
-strcmp(s, "float") == 0);
+strcmp(s, "float") == 0 ||
+strcmp(s, "decimal") == 0);
 
if (!numeric[i]) {
vartotal += len[i];
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Jun2010 branch.

2010-08-19 Thread Sjoerd Mullender 
Changeset: 83b10c04d473 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83b10c04d473
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: default
Log Message:

Merge with Jun2010 branch.


diffs (12 lines):

diff -r f61f6ab3acbb -r 83b10c04d473 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxThu Aug 19 12:38:44 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxThu Aug 19 14:44:59 2010 +0200
@@ -2308,7 +2308,7 @@
 BBPdestroy(BAT *b)
 {
int clear = 1;
-   bat hp = VIEWhparent(b), tp = VIEWtparent(b);
+   bat hp = b->H->heap.parentid, tp = b->T->heap.parentid;
bat vhp = VIEWvhparent(b), vtp = VIEWvtparent(b);
 
if (isVIEW(b)) {/* a physical view */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - Fix for bug 2658.

2010-08-19 Thread Sjoerd Mullender 
Changeset: f5c1caf71d65 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5c1caf71d65
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
Branch: Jun2010
Log Message:

Fix for bug 2658.
When a logical view is destroyed, it should also lower its parent's share count.


diffs (12 lines):

diff -r af4ef43d21e4 -r f5c1caf71d65 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mxThu Aug 19 10:27:23 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mxThu Aug 19 14:30:36 2010 +0200
@@ -2136,7 +2136,7 @@
 BBPdestroy(BAT *b)
 {
int clear = 1;
-   bat hp = VIEWhparent(b), tp = VIEWtparent(b);
+   bat hp = b->H->heap.parentid, tp = b->T->heap.parentid;
bat vhp = VIEWvhparent(b), vtp = VIEWvtparent(b);
 
if (isVIEW(b)) {/* a physical view */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - use alloca to dynamically allocate the array ...

2010-08-19 Thread Fabian Groffen 
Changeset: f61f6ab3acbb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f61f6ab3acbb
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:

use alloca to dynamically allocate the array for compilers that don't like 
variable sizes (Microsoft compiler


diffs (12 lines):

diff -r 77e5a68612c9 -r f61f6ab3acbb clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Thu Aug 19 10:34:48 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Aug 19 12:38:44 2010 +0200
@@ -462,7 +462,7 @@
char *t;
int rows = 0;   /* return number of output lines printed */
size_t ulen;
-   int cutafter[fields];
+   int *cutafter = alloca(sizeof(int) * fields);
 
/* trim the text if needed */
if (trim == 1) {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Initialise printfields outside the conditiona...

2010-08-19 Thread Fabian Groffen 
Changeset: 77e5a68612c9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77e5a68612c9
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:

Initialise printfields outside the conditional loop because it is used below 
the loop too.


diffs (20 lines):

diff -r f49450f42478 -r 77e5a68612c9 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Thu Aug 19 10:27:52 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Aug 19 10:34:48 2010 +0200
@@ -1076,7 +1076,7 @@
 SQLrenderer(MapiHdl hdl, char singleinstr)
 {
int i, total, lentotal, vartotal, minvartotal;
-   int fields, oldfields = 0, printfields, max = 1, graphwaste = 0;
+   int fields, oldfields = 0, printfields = 0, max = 1, graphwaste = 0;
int *len = NULL, *hdr = NULL, *numeric = NULL;
char **rest = NULL;
char buf[50];
@@ -1113,7 +1113,6 @@
lentotal = 0;
vartotal = 0;
minvartotal = 0;
-   printfields = 0;
for (i = 0; i < fields; i++) {
char *s;
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Wrap message given on command line.

2010-08-19 Thread Sjoerd Mullender 
Changeset: f49450f42478 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f49450f42478
Modified Files:

Branch: default
Log Message:

Wrap message given on command line.


diffs (13 lines):

diff -r 8a070d1343d5 -r f49450f42478 buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog   Thu Aug 19 10:19:11 2010 +0200
+++ b/buildtools/conf/Maddlog   Thu Aug 19 10:27:52 2010 +0200
@@ -89,7 +89,8 @@
 IDENTITY=$(hg showconfig ui.username)
 
 if [ $# -gt 0 ]; then
-msg=$*
+msg=$(echo "  $*" | fmt)
+mst=${msg#  }
 else
 nl=$'\n  '
 echo "Log message (end with ^D or empty line):"
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - Wrap message given on command line.

2010-08-19 Thread Sjoerd Mullender 
Changeset: af4ef43d21e4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af4ef43d21e4
Modified Files:
buildtools/conf/Maddlog
Branch: Jun2010
Log Message:

Wrap message given on command line.


diffs (13 lines):

diff -r 2b6866300f0a -r af4ef43d21e4 buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog   Thu Aug 19 10:09:31 2010 +0200
+++ b/buildtools/conf/Maddlog   Thu Aug 19 10:27:23 2010 +0200
@@ -89,7 +89,8 @@
 IDENTITY=$(hg showconfig ui.username)
 
 if [ $# -gt 0 ]; then
-msg=$*
+msg=$(echo "  $*" | fmt)
+mst=${msg#  }
 else
 nl=$'\n  '
 echo "Log message (end with ^D or empty line):"
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Initialise minvartotal

2010-08-19 Thread Fabian Groffen 
Changeset: 8a070d1343d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a070d1343d5
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:

Initialise minvartotal


diffs (11 lines):

diff -r 2669b59c79e3 -r 8a070d1343d5 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Thu Aug 19 10:11:29 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Aug 19 10:19:11 2010 +0200
@@ -1112,6 +1112,7 @@
total = 0;
lentotal = 0;
vartotal = 0;
+   minvartotal = 0;
printfields = 0;
for (i = 0; i < fields; i++) {
char *s;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge.

2010-08-19 Thread Sjoerd Mullender 
Changeset: 2669b59c79e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2669b59c79e3
Modified Files:

Branch: default
Log Message:

Merge.

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

MonetDB: Jun2010 - Merge heads.

2010-08-19 Thread Sjoerd Mullender 
Changeset: 2b6866300f0a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b6866300f0a
Modified Files:

Branch: Jun2010
Log Message:

Merge heads.


diffs (124 lines):

diff -r 6eaa76bd4fbd -r 2b6866300f0a clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Thu Aug 19 09:31:31 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Thu Aug 19 10:09:31 2010 +0200
@@ -1,9 +1,16 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
+* Thu Aug 19 2010 Sjoerd Mullender 
+- mclient now complains about NULL bytes in the input when in interactive
+  mode.
+
 * Fri Aug 13 2010 Fabian Groffen 
-- Slight rendering improvements to mclient's tabular output when rendering 
results larger than the available screen width, headers were previously 
unnecessarily squeezed.
-- Fix bug #2650, a too small buffer caused the active database as reported by 
mclient's welcome message to be truncated
+- Slight rendering improvements to mclient's tabular output when
+  rendering results larger than the available screen width, headers
+  were previously unnecessarily squeezed.
+- Fix bug #2650, a too small buffer caused the active database as
+  reported by mclient's welcome message to be truncated
 
 * Wed Jul 21 2010 Fabian Groffen 
 - Add --version option to mclient.
diff -r 6eaa76bd4fbd -r 2b6866300f0a clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Thu Aug 19 09:31:31 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Aug 19 10:09:31 2010 +0200
@@ -1685,7 +1685,7 @@
MapiHdl hdl = mapi_get_active(mid);
MapiMsg rc = MOK;
int sent = 0;   /* whether we sent any data to the server */
-   int first = 1;  /* first line processing */
+   int lineno = 1;
 
 #ifdef HAVE_LIBREADLINE
if (prompt == NULL)
@@ -1693,6 +1693,10 @@
oldbuf = buf = malloc(BUFSIZ);
 
do {
+   if (prompt) {
+   /* clear errors when interactive */
+   errseen = 0;
+   }
stream_flush(toConsole);
timerPause();
 #ifdef HAVE_LIBREADLINE
@@ -1721,6 +1725,8 @@
} else
 #endif
{
+   int c = 0;
+
 #ifndef HAVE_LIBREADLINE
if (prompt) {
fputs(hdl ? "more>" : prompt, stdout);
@@ -1730,11 +1736,35 @@
if (buf != oldbuf)
free(buf);
buf = oldbuf;
-   line = fgets(buf, BUFSIZ, fp);
-   }
-   if (prompt) {
-   /* clear errors when interactive */
-   errseen = 0;
+   line = buf;
+   while (line < buf + BUFSIZ - 1 &&
+  (c = getc(fp)) != EOF) {
+   if (c == 0) {
+   fprintf(stderr, "NULL byte in input on 
line %d of input\n", lineno);
+   /* read away rest of line */
+   while ((c = getc(fp)) != EOF &&
+  c != '\n')
+   ;
+   errseen = 1;
+   c = 0x1234; /* indicate error */
+   if (hdl) {
+   mapi_close_handle(hdl);
+   hdl = NULL;
+   }
+   break;
+   }
+   *line++ = c;
+   if (c == '\n')
+   break;
+   }
+   if (c == 0x1234)
+   continue;
+   if (line == buf)
+   line = NULL;
+   else {
+   *line = 0;
+   line = buf;
+   }
}
 #ifdef HAVE_ICONV
if (line != NULL && encoding != NULL && cd_in != (iconv_t) -1) {
@@ -1755,10 +1785,10 @@
 #ifdef HAVE_ICONV
encoding == NULL &&
 #endif
-   first &&
+   lineno == 1 &&
strncmp(line, UTF8BOM, UTF8BOMLENGTH) == 0)
line += UTF8BOMLENGTH;  /* skip Byte Order Mark (BOM) */
-   first = 0;
+   lineno++;
if (line == NULL ||
(mode == XQUERY && line[0] == '<' && line[1] == '>')) {
/* end of file */
diff -r 6eaa76bd4fbd -r 2b6866300f0a 
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.err
--- a/sql/src/test/BugTrac

MonetDB: default - Merge with Jun2010 branch.

2010-08-19 Thread Sjoerd Mullender 
Changeset: a23de431529b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a23de431529b
Modified Files:

Branch: default
Log Message:

Merge with Jun2010 branch.


diffs (46 lines):

diff -r 3ca8f0ffca39 -r a23de431529b 
sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests   
Thu Aug 19 10:07:52 2010 +0200
@@ -0,0 +1,1 @@
+AVG_of_SQRT.SF-2757642.unpack_csv
diff -r 3ca8f0ffca39 -r a23de431529b 
sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out 
Thu Aug 19 10:07:20 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out 
Thu Aug 19 10:07:52 2010 +0200
@@ -30,7 +30,8 @@
 % L1,  L2, single_value,   L3, single_value,   L4 # name
 % char,wrd,char,   double, char,   double # type
 % 22,  9,  15, 22, 20, 22 # length
-[ "count(n8) == 1",1,  "avg(n8) == 1.21",  
1.20998,"avg(sqrt(n8)) == 1.1", 1.09998 ]
+[ "count(n8) == 1",1,  "avg(n8) == 1.21",  
1.21001,"avg(sqrt(n8)) == 1.1", 1.09998 ]
+#select 'avg(sqrt(n8)) == 1.1', avg(sqrt(a)) from n8;
 % .L11,sys. # table_name
 % L11, L12 # name
 % char,double # type
diff -r 3ca8f0ffca39 -r a23de431529b sql/src/test/BugTracker-2009/Tests/All
--- a/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 10:07:20 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 10:07:52 2010 +0200
@@ -48,13 +48,13 @@
 TribooleanFailureWithSubquery.SF-2679434
 nullstr.SF-2704016
 POWER_vs_prod.SF-2596114
-#parallel_bulk-load.SF-2771052.unpack_csv
-#parallel_bulk-load.SF-2771052.test
-#parallel_bulk-load.SF-2771052.clean
+parallel_bulk-load.SF-2771052.unpack_csv
+parallel_bulk-load.SF-2771052.test
+parallel_bulk-load.SF-2771052.clean
 wrong_error_message.SF-2637051
-#AVG_of_SQRT.SF-2757642.unpack_csv
-#AVG_of_SQRT.SF-2757642.test
-#AVG_of_SQRT.SF-2757642.clean
+AVG_of_SQRT.SF-2757642.unpack_csv
+AVG_of_SQRT.SF-2757642.test
+AVG_of_SQRT.SF-2757642.clean
 missing_column_name.SF-2776100
 dumping_tables.SF-2776908
 dumping_tables.SF-2776908--performance
diff -r 3ca8f0ffca39 -r a23de431529b 
sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ 
b/sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests
Thu Aug 19 10:07:52 2010 +0200
@@ -0,0 +1,1 @@
+parallel_bulk-load.SF-2771052.unpack_csv
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Jun2010 branch.

2010-08-19 Thread Sjoerd Mullender 
Changeset: 3ca8f0ffca39 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ca8f0ffca39
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:

Merge with Jun2010 branch.


diffs (124 lines):

diff -r b355aba116d3 -r 3ca8f0ffca39 clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Wed Aug 18 21:36:05 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Thu Aug 19 10:07:20 2010 +0200
@@ -1,9 +1,16 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
+* Thu Aug 19 2010 Sjoerd Mullender 
+- mclient now complains about NULL bytes in the input when in interactive
+  mode.
+
 * Fri Aug 13 2010 Fabian Groffen 
-- Slight rendering improvements to mclient's tabular output when rendering 
results larger than the available screen width, headers were previously 
unnecessarily squeezed.
-- Fix bug #2650, a too small buffer caused the active database as reported by 
mclient's welcome message to be truncated
+- Slight rendering improvements to mclient's tabular output when
+  rendering results larger than the available screen width, headers
+  were previously unnecessarily squeezed.
+- Fix bug #2650, a too small buffer caused the active database as
+  reported by mclient's welcome message to be truncated
 
 * Wed Jul 21 2010 Fabian Groffen 
 - Add --version option to mclient.
diff -r b355aba116d3 -r 3ca8f0ffca39 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Aug 18 21:36:05 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Thu Aug 19 10:07:20 2010 +0200
@@ -1801,7 +1801,7 @@
MapiHdl hdl = mapi_get_active(mid);
MapiMsg rc = MOK;
int sent = 0;   /* whether we sent any data to the server */
-   int first = 1;  /* first line processing */
+   int lineno = 1;
 
 #ifdef HAVE_LIBREADLINE
if (prompt == NULL)
@@ -1809,6 +1809,10 @@
oldbuf = buf = malloc(BUFSIZ);
 
do {
+   if (prompt) {
+   /* clear errors when interactive */
+   errseen = 0;
+   }
mnstr_flush(toConsole);
timerPause();
 #ifdef HAVE_LIBREADLINE
@@ -1837,6 +1841,8 @@
} else
 #endif
{
+   int c = 0;
+
 #ifndef HAVE_LIBREADLINE
if (prompt) {
fputs(hdl ? "more>" : prompt, stdout);
@@ -1846,11 +1852,35 @@
if (buf != oldbuf)
free(buf);
buf = oldbuf;
-   line = fgets(buf, BUFSIZ, fp);
-   }
-   if (prompt) {
-   /* clear errors when interactive */
-   errseen = 0;
+   line = buf;
+   while (line < buf + BUFSIZ - 1 &&
+  (c = getc(fp)) != EOF) {
+   if (c == 0) {
+   fprintf(stderr, "NULL byte in input on 
line %d of input\n", lineno);
+   /* read away rest of line */
+   while ((c = getc(fp)) != EOF &&
+  c != '\n')
+   ;
+   errseen = 1;
+   c = 0x1234; /* indicate error */
+   if (hdl) {
+   mapi_close_handle(hdl);
+   hdl = NULL;
+   }
+   break;
+   }
+   *line++ = c;
+   if (c == '\n')
+   break;
+   }
+   if (c == 0x1234)
+   continue;
+   if (line == buf)
+   line = NULL;
+   else {
+   *line = 0;
+   line = buf;
+   }
}
 #ifdef HAVE_ICONV
if (line != NULL && encoding != NULL && cd_in != (iconv_t) -1) {
@@ -1871,10 +1901,10 @@
 #ifdef HAVE_ICONV
encoding == NULL &&
 #endif
-   first &&
+   lineno == 1 &&
strncmp(line, UTF8BOM, UTF8BOMLENGTH) == 0)
line += UTF8BOMLENGTH;  /* skip Byte Order Mark (BOM) */
-   first = 0;
+   lineno++;
if (line == NULL ||
(mode == XQUERY && line[0] == '<' && line[1] == '>')) {
/* end of file */
diff -r b355aba116d3 -r 3ca8f0ffca39 
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF

MonetDB: Jun2010 - mclient now complains about NULL bytes in the...

2010-08-19 Thread Sjoerd Mullender 
Changeset: 31bddf8bd9a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31bddf8bd9a0
Modified Files:
clients/ChangeLog.Jun2010
clients/src/mapiclient/mclient.mx

sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.stable.err
Branch: Jun2010
Log Message:

mclient now complains about NULL bytes in the input, even in interactive mode.


diffs (124 lines):

diff -r 2a288b5e6274 -r 31bddf8bd9a0 clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Wed Aug 18 18:41:45 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Tue Aug 17 23:33:11 2010 +0200
@@ -1,9 +1,16 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
+* Thu Aug 19 2010 Sjoerd Mullender 
+- mclient now complains about NULL bytes in the input when in interactive
+  mode.
+
 * Fri Aug 13 2010 Fabian Groffen 
-- Slight rendering improvements to mclient's tabular output when rendering 
results larger than the available screen width, headers were previously 
unnecessarily squeezed.
-- Fix bug #2650, a too small buffer caused the active database as reported by 
mclient's welcome message to be truncated
+- Slight rendering improvements to mclient's tabular output when
+  rendering results larger than the available screen width, headers
+  were previously unnecessarily squeezed.
+- Fix bug #2650, a too small buffer caused the active database as
+  reported by mclient's welcome message to be truncated
 
 * Wed Jul 21 2010 Fabian Groffen 
 - Add --version option to mclient.
diff -r 2a288b5e6274 -r 31bddf8bd9a0 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Wed Aug 18 18:41:45 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Tue Aug 17 23:33:11 2010 +0200
@@ -1685,7 +1685,7 @@
MapiHdl hdl = mapi_get_active(mid);
MapiMsg rc = MOK;
int sent = 0;   /* whether we sent any data to the server */
-   int first = 1;  /* first line processing */
+   int lineno = 1;
 
 #ifdef HAVE_LIBREADLINE
if (prompt == NULL)
@@ -1693,6 +1693,10 @@
oldbuf = buf = malloc(BUFSIZ);
 
do {
+   if (prompt) {
+   /* clear errors when interactive */
+   errseen = 0;
+   }
stream_flush(toConsole);
timerPause();
 #ifdef HAVE_LIBREADLINE
@@ -1721,6 +1725,8 @@
} else
 #endif
{
+   int c = 0;
+
 #ifndef HAVE_LIBREADLINE
if (prompt) {
fputs(hdl ? "more>" : prompt, stdout);
@@ -1730,11 +1736,35 @@
if (buf != oldbuf)
free(buf);
buf = oldbuf;
-   line = fgets(buf, BUFSIZ, fp);
-   }
-   if (prompt) {
-   /* clear errors when interactive */
-   errseen = 0;
+   line = buf;
+   while (line < buf + BUFSIZ - 1 &&
+  (c = getc(fp)) != EOF) {
+   if (c == 0) {
+   fprintf(stderr, "NULL byte in input on 
line %d of input\n", lineno);
+   /* read away rest of line */
+   while ((c = getc(fp)) != EOF &&
+  c != '\n')
+   ;
+   errseen = 1;
+   c = 0x1234; /* indicate error */
+   if (hdl) {
+   mapi_close_handle(hdl);
+   hdl = NULL;
+   }
+   break;
+   }
+   *line++ = c;
+   if (c == '\n')
+   break;
+   }
+   if (c == 0x1234)
+   continue;
+   if (line == buf)
+   line = NULL;
+   else {
+   *line = 0;
+   line = buf;
+   }
}
 #ifdef HAVE_ICONV
if (line != NULL && encoding != NULL && cd_in != (iconv_t) -1) {
@@ -1755,10 +1785,10 @@
 #ifdef HAVE_ICONV
encoding == NULL &&
 #endif
-   first &&
+   lineno == 1 &&
strncmp(line, UTF8BOM, UTF8BOMLENGTH) == 0)
line += UTF8BOMLENGTH;  /* skip Byte Order Mark (BOM) */
-   first = 0;
+   lineno++;
if (line == NULL ||
(mode == XQUERY && l

MonetDB: default - merge with Jun2010 branch

2010-08-19 Thread Stefan Manegold 
Changeset: a370bd77e0e6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a370bd77e0e6
Modified Files:

Branch: default
Log Message:

merge with Jun2010 branch


diffs (46 lines):

diff -r b355aba116d3 -r a370bd77e0e6 
sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests   
Thu Aug 19 09:33:15 2010 +0200
@@ -0,0 +1,1 @@
+AVG_of_SQRT.SF-2757642.unpack_csv
diff -r b355aba116d3 -r a370bd77e0e6 
sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out 
Wed Aug 18 21:36:05 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out 
Thu Aug 19 09:33:15 2010 +0200
@@ -30,7 +30,8 @@
 % L1,  L2, single_value,   L3, single_value,   L4 # name
 % char,wrd,char,   double, char,   double # type
 % 22,  9,  15, 22, 20, 22 # length
-[ "count(n8) == 1",1,  "avg(n8) == 1.21",  
1.20998,"avg(sqrt(n8)) == 1.1", 1.09998 ]
+[ "count(n8) == 1",1,  "avg(n8) == 1.21",  
1.21001,"avg(sqrt(n8)) == 1.1", 1.09998 ]
+#select 'avg(sqrt(n8)) == 1.1', avg(sqrt(a)) from n8;
 % .L11,sys. # table_name
 % L11, L12 # name
 % char,double # type
diff -r b355aba116d3 -r a370bd77e0e6 sql/src/test/BugTracker-2009/Tests/All
--- a/sql/src/test/BugTracker-2009/Tests/AllWed Aug 18 21:36:05 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 09:33:15 2010 +0200
@@ -48,13 +48,13 @@
 TribooleanFailureWithSubquery.SF-2679434
 nullstr.SF-2704016
 POWER_vs_prod.SF-2596114
-#parallel_bulk-load.SF-2771052.unpack_csv
-#parallel_bulk-load.SF-2771052.test
-#parallel_bulk-load.SF-2771052.clean
+parallel_bulk-load.SF-2771052.unpack_csv
+parallel_bulk-load.SF-2771052.test
+parallel_bulk-load.SF-2771052.clean
 wrong_error_message.SF-2637051
-#AVG_of_SQRT.SF-2757642.unpack_csv
-#AVG_of_SQRT.SF-2757642.test
-#AVG_of_SQRT.SF-2757642.clean
+AVG_of_SQRT.SF-2757642.unpack_csv
+AVG_of_SQRT.SF-2757642.test
+AVG_of_SQRT.SF-2757642.clean
 missing_column_name.SF-2776100
 dumping_tables.SF-2776908
 dumping_tables.SF-2776908--performance
diff -r b355aba116d3 -r a370bd77e0e6 
sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ 
b/sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests
Thu Aug 19 09:33:15 2010 +0200
@@ -0,0 +1,1 @@
+parallel_bulk-load.SF-2771052.unpack_csv
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - minor output update

2010-08-19 Thread Stefan Manegold 
Changeset: 6eaa76bd4fbd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6eaa76bd4fbd
Modified Files:

sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out
Branch: Jun2010
Log Message:

minor output update


diffs (13 lines):

diff -r 7bdaca536233 -r 6eaa76bd4fbd 
sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out 
Thu Aug 19 09:28:06 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.stable.out 
Thu Aug 19 09:31:31 2010 +0200
@@ -30,7 +30,8 @@
 % L1,  L2, single_value,   L3, single_value,   L4 # name
 % char,wrd,char,   double, char,   double # type
 % 22,  9,  15, 22, 20, 22 # length
-[ "count(n8) == 1",1,  "avg(n8) == 1.21",  
1.20998,"avg(sqrt(n8)) == 1.1", 1.09998 ]
+[ "count(n8) == 1",1,  "avg(n8) == 1.21",  
1.21001,"avg(sqrt(n8)) == 1.1", 1.09998 ]
+#select 'avg(sqrt(n8)) == 1.1', avg(sqrt(a)) from n8;
 % .L11,sys. # table_name
 % L11, L12 # name
 % char,double # type
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Jun2010 - re-activated test that got (most probably by ...

2010-08-19 Thread Stefan Manegold 
Changeset: 7bdaca536233 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7bdaca536233
Modified Files:
sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests
sql/src/test/BugTracker-2009/Tests/All

sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests
Branch: Jun2010
Log Message:

re-activated test that got (most probably by accident) de-activated with 
changeset f23dc7f92a0f
cf. http://dev.monetdb.org/hg/MonetDB/rev/f23dc7f92a0f


diffs (33 lines):

diff -r 2a288b5e6274 -r 7bdaca536233 
sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.test.reqtests   
Thu Aug 19 09:28:06 2010 +0200
@@ -0,0 +1,1 @@
+AVG_of_SQRT.SF-2757642.unpack_csv
diff -r 2a288b5e6274 -r 7bdaca536233 sql/src/test/BugTracker-2009/Tests/All
--- a/sql/src/test/BugTracker-2009/Tests/AllWed Aug 18 18:41:45 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/AllThu Aug 19 09:28:06 2010 +0200
@@ -48,13 +48,13 @@
 TribooleanFailureWithSubquery.SF-2679434
 nullstr.SF-2704016
 POWER_vs_prod.SF-2596114
-#parallel_bulk-load.SF-2771052.unpack_csv
-#parallel_bulk-load.SF-2771052.test
-#parallel_bulk-load.SF-2771052.clean
+parallel_bulk-load.SF-2771052.unpack_csv
+parallel_bulk-load.SF-2771052.test
+parallel_bulk-load.SF-2771052.clean
 wrong_error_message.SF-2637051
-#AVG_of_SQRT.SF-2757642.unpack_csv
-#AVG_of_SQRT.SF-2757642.test
-#AVG_of_SQRT.SF-2757642.clean
+AVG_of_SQRT.SF-2757642.unpack_csv
+AVG_of_SQRT.SF-2757642.test
+AVG_of_SQRT.SF-2757642.clean
 missing_column_name.SF-2776100
 dumping_tables.SF-2776908
 dumping_tables.SF-2776908--performance
diff -r 2a288b5e6274 -r 7bdaca536233 
sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ 
b/sql/src/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.test.reqtests
Thu Aug 19 09:28:06 2010 +0200
@@ -0,0 +1,1 @@
+parallel_bulk-load.SF-2771052.unpack_csv
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list