Changeset: 03ce0fd0c568 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03ce0fd0c568
Modified Files:
Branch: sciql
Log Message:
Merge with default branch.
diffs (truncated from 375 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -588,7 +588,7 @@
* Thu Apr 14 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.1-20110414
- gdk: Fixed bugs in antiselect which gave the incorrect result when upper
- and lower bount were equal. This bug could be triggered by the SQL
+ and lower bound were equal. This bug could be triggered by the SQL
query SELECT * FROM t WHERE x NOT BETWEEN y AND y.
* Thu Apr 14 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.1-20110414
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -278,6 +278,35 @@
AC_ENABLE_SHARED
AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
+dnl logs usually end up in /var/log
+logdir='${localstatedir}/log/monetdb'
+AC_ARG_WITH(logdir,
+ [--with-logdir=DIR Where to put log files
(LOCALSTATEDIR/log/monetdb/)],
+ [case "$withval" in
+ yes|no|auto)
+ AC_MSG_WARN([--with-logdir called without argument -
will use default])
+ ;;
+ *)
+ logdir="$withval"
+ ;;
+ esac]
+)
+
+dnl pidfiles usually end up in /var/run
+rundir='${localstatedir}/run/monetdb'
+AC_ARG_WITH(rundir,
+ [--with-rundir=DIR Where to put pid files
(LOCALSTATEDIR/run/monetdb/)],
+ [case "$withval" in
+ yes|no|auto)
+ AC_MSG_WARN([--with-rundir called without argument -
will use default])
+ ;;
+ *)
+ rundir="$withval"
+ ;;
+ esac]
+)
+
+
dnl checks for programs
AC_LANG([C])
@@ -2133,17 +2162,21 @@
PKG_CHECK_MODULES([pcre], [libpcre >= $req_pcre_ver],
[have_pcre=yes], [have_pcre=no])
if test "x$have_pcre" = xyes; then
- AC_PATH_PROG(PCRETEST,pcretest)
- if test "x$PCRETEST" = x; then
- AC_MSG_ERROR([could not find pcretest])
- else
- AC_MSG_CHECKING(whether pcre comes with UTF-8 support)
- pcre_utf8="`$PCRETEST -C 2>/dev/null | grep 'UTF-8 support' |
sed -e 's|^ *||' -e 's| *$||'`"
- if test "x$pcre_utf8" != "xUTF-8 support"; then
- AC_MSG_ERROR([PCRE library compiled without UTF-8
support])
- fi
- AC_MSG_RESULT([yes])
- fi
+ AC_MSG_CHECKING(whether pcre comes with UTF-8 support)
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $pcre_LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $pcre_CFLAGS"
+ AC_RUN_IFELSE([AC_LANG_PROGRAM(
+ [[#include <pcre.h>]],
+ [[int rc; pcre_config(PCRE_CONFIG_UTF8, &rc); exit(!rc);]])],
+ AC_MSG_RESULT([yes]),
+ have_pcre=no; AC_MSG_RESULT([no]),
+ AC_MSG_RESULT([assuming yes]))
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+fi
+if test "x$have_pcre" = xyes; then
AC_DEFINE(HAVE_LIBPCRE, 1, [Define if you have the pcre library])
fi
AM_CONDITIONAL(HAVE_PCRE, test x"$have_pcre" != xno)
@@ -2930,6 +2963,14 @@
AC_SUBST(Xlocalstatedir)
AC_SUBST(Elocalstatedir)
AC_SUBST(QXlocalstatedir)
+Xlogdir="`$translatepath "$logdir"`"
+eval "Elogdir=${Xlogdir}"
+AC_SUBST(logdir)
+AC_SUBST(Elogdir)
+Xrundir="`$translatepath "$rundir"`"
+eval "Erundir=${Xrundir}"
+AC_SUBST(rundir)
+AC_SUBST(Erundir)
Qlibdir="$libdir"
Xlibdir="`$translatepath "$libdir"`"
QXlibdir="`echo "$Xlibdir" | sed 's/\\\\/\\\\\\\\/g'`"
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@
monetdb (11.3.1-20110414) unstable; urgency=low
* gdk: Fixed bugs in antiselect which gave the incorrect result when upper
- and lower bount were equal. This bug could be triggered by the SQL
+ and lower bound were equal. This bug could be triggered by the SQL
query SELECT * FROM t WHERE x NOT BETWEEN y AND y.
-- Sjoerd Mullender <sjo...@acm.org> Thu, 14 Apr 2011 10:11:07 +0200
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -3,7 +3,7 @@
* Thu Apr 14 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.1-20110414
- Fixed bugs in antiselect which gave the incorrect result when upper
- and lower bount were equal. This bug could be triggered by the SQL
+ and lower bound were equal. This bug could be triggered by the SQL
query SELECT * FROM t WHERE x NOT BETWEEN y AND y.
* Tue Mar 22 2011 Fabian Groffen <fab...@cwi.nl> - 11.1.1-20110324
diff --git a/geom/ChangeLog.Apr2011 b/geom/ChangeLog.Apr2011
--- a/geom/ChangeLog.Apr2011
+++ b/geom/ChangeLog.Apr2011
@@ -1,3 +1,7 @@
# ChangeLog file for geom
# This file is updated with Maddlog
+* Wed Apr 27 2011 Sjoerd Mullender <sjo...@acm.org>
+- Fixed various problems so that now all our tests work correctly on
+ all our testing platforms.
+
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -6,3 +6,4 @@
crash_in_modulo_rand.Bug-2766
nested_select.Bug-2801
ambigous_idx_name.Bug-2800
+crash_on_alias.Bug-2798
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.sql
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.sql
@@ -0,0 +1,14 @@
+-- can't drop table after crash
+START TRANSACTION;
+
+CREATE TABLE dbg (a INT, b INT);
+INSERT INTO dbg (a,b) VALUES (10,10);
+
+-- no alias around the SUM(b), works
+SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
+
+-- alias e, crashes :/
+SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP
+BY d;
+
+ROLLBACK;
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.err
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'crash_on_alias.Bug-2798` in directory 'test/BugTracker-2011`
itself:
+
+
+# 14:09:56 >
+# 14:09:56 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Apr2011-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set mapi_port=31436 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set
mal_listing=0 ; echo ; echo Over..
+# 14:09:56 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/monetdb/Apr2011/program-x86_64/var/lib/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Apr2011-volund.ins.cwi.nl/sql/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 31436
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 14:09:56 >
+# 14:09:56 > mclient -lsql -ftest -i -e --host=volund --port=31436
+# 14:09:56 >
+
+
+# 14:09:56 >
+# 14:09:56 > Done.
+# 14:09:56 >
+
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -0,0 +1,53 @@
+stdout of test 'crash_on_alias.Bug-2798` in directory 'test/BugTracker-2011`
itself:
+
+
+# 14:09:56 >
+# 14:09:56 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Apr2011-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set mapi_port=31436 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set
mal_listing=0 ; echo ; echo Over..
+# 14:09:56 >
+
+# MonetDB 5 server v11.3.1 "Apr2011-f9a21e4aaff7"
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
+# Found 7.749 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://volund.ins.cwi.nl:31436/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+could not find (null).e
+dbg.d
+dbg.L10
+L12.L12
+dbg.d
+
+Over..
+
+# 14:09:56 >
+# 14:09:56 > mclient -lsql -ftest -i -e --host=volund --port=31436
+# 14:09:56 >
+
+#START TRANSACTION;
+#CREATE TABLE dbg (a INT, b INT);
+#INSERT INTO dbg (a,b) VALUES (10,10);
+[ 1 ]
+#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
+% sys.dbg, sys.dbg, . # table_name
+% d, L3, f # name
+% int, bigint, bigint # type
+% 2, 2, 2 # length
+[ 10, 10, 10 ]
+#SELECT a as d, SUM(b) as e, (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP
BY d;
+% sys.dbg, sys.dbg, . # table_name
+% d, e, f # name
+% int, bigint, bigint # type
+% 2, 2, 2 # length
+[ 10, 10, 10 ]
+
+# 14:09:56 >
+# 14:09:56 > Done.
+# 14:09:56 >
+
diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog
--- a/tools/merovingian/ChangeLog
+++ b/tools/merovingian/ChangeLog
@@ -1,3 +1,6 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Fri Apr 29 2011 Fabian Groffen <fab...@cwi.nl>
+- added status property to get command
+
diff --git a/tools/merovingian/daemon/.merovingian_properties.in
b/tools/merovingian/daemon/.merovingian_properties.in
--- a/tools/merovingian/daemon/.merovingian_properties.in
+++ b/tools/merovingian/daemon/.merovingian_properties.in
@@ -24,5 +24,5 @@
# is, however, crucial that the file locations in this file are present.
-logfile=@Elocalstatedir@@DIRSEP@log@DIRSEP@monetdb@dir...@merovingian.log
-pidfile=@Elocalstatedir@@DIRSEP@run@DIRSEP@monetdb@dir...@merovingian.pid
+logfile=@Elogdir@@dir...@merovingian.log
+pidfile=@Erundir@@dir...@merovingian.pid
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -17,9 +17,9 @@
man_MANS = monetdbd.1
-monetdb_var_logdir = $(localstatedir)/log/monetdb
+monetdb_var_logdir = $(logdir)
monetdb_var_log_DATA =
-monetdb_var_rundir = $(localstatedir)/run/monetdb
+monetdb_var_rundir = $(rundir)
monetdb_var_run_DATA =
monetdb_var_dbfarmdir = $(localstatedir)/monetdb5/dbfarm
monetdb_var_dbfarm_DATA = .merovingian_properties
diff --git a/tools/merovingian/daemon/argvcmds.c
b/tools/merovingian/daemon/argvcmds.c
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
