Changeset: 72a897618c9b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72a897618c9b
Added Files:
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.sql
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.err
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.sql
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.err
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
Removed Files:
monetdb5/modules/kernel/batcast.mx
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
buildtools/ChangeLog.Apr2012
buildtools/doc/windowsbuild.rst
clients/Tests/exports.stable.out
configure.ag
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_bbp.mx
gdk/gdk_calc.c
gdk/gdk_heap.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_search.mx
gdk/gdk_storage.c
gdk/gdk_utils.c
monetdb5/extras/compiler/mal_compiler.c
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/jaql/jaqltree.h
monetdb5/extras/jaql/parser/jaql.y
monetdb5/mal/Tests/tst913.mal
monetdb5/mal/Tests/tst913.stable.out
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/batcalc.c
monetdb5/modules/kernel/batcalc.mal
monetdb5/modules/kernel/batcalc.mal.sh
monetdb5/modules/mal/mal_init.mal
monetdb5/optimizer/Tests/GCexample.stable.out
monetdb5/optimizer/Tests/tst4800.stable.out
monetdb5/optimizer/Tests/tst4900.stable.out
monetdb5/scheduler/run_pipeline.mx
sql/backends/monet5/Makefile.ag
sql/backends/monet5/datacell/50_datacell.mal
sql/backends/monet5/datacell/Makefile.ag
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/datacell.mal
sql/backends/monet5/sql_scenario.c
sql/server/rel_bin.c
sql/server/rel_psm.c
sql/server/sql_rel2bin.c
sql/server/sql_statement.c
sql/server/sql_statement.h
sql/storage/restrict/restrict_storage.c
sql/storage/restrict/restrict_table.c
sql/storage/store.c
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.sql
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err
sql/test/BugTracker-2012/Tests/table_returning_func_returns_too_many_columns.Bug-3077.stable.err
Branch: sciql
Log Message:
Merge with defautl branch.
diffs (truncated from 4952 to 300 lines):
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
@@ -1035,12 +1035,6 @@
}
"Entry"
{
- "MsmKey" = "8:_DDDF62BF89CA4A7EB21FA5D0AF237E95"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_DE011B8A794D4FD9B01C9F53B7BEA736"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -4663,26 +4657,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DDDF62BF89CA4A7EB21FA5D0AF237E95"
- {
- "SourcePath" = "8:lib\\monetdb5\\batcast.mal"
- "TargetName" = "8:batcast.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE011B8A794D4FD9B01C9F53B7BEA736"
{
"SourcePath" = "8:lib\\monetdb5\\opt_joinselect.mal"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -1143,12 +1143,6 @@
}
"Entry"
{
- "MsmKey" = "8:_F34CAA830B6541F5B416AA2C43E409F0"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_F49AEE929FA842009A0D617298659436"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -5023,26 +5017,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F34CAA830B6541F5B416AA2C43E409F0"
- {
- "SourcePath" = "8:lib\\monetdb5\\batcast.mal"
- "TargetName" = "8:batcast.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F49AEE929FA842009A0D617298659436"
{
"SourcePath" = "8:lib\\monetdb5\\opt_aliases.mal"
diff --git a/buildtools/ChangeLog.Apr2012 b/buildtools/ChangeLog.Apr2012
--- a/buildtools/ChangeLog.Apr2012
+++ b/buildtools/ChangeLog.Apr2012
@@ -1,3 +1,6 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Wed May 2 2012 Sjoerd Mullender <[email protected]>
+- Windows: we now use OpenSSL 1.0.1b.
+
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -285,17 +285,17 @@ required for the MonetDB5 component, and
the clients component when it needs to talk to a MonetDB5 server.
Download the source from http://www.openssl.org/. We used the latest
-stable version (1.0.0d). Follow the instructions in the file
+stable version (1.0.1b). Follow the instructions in the file
``INSTALL.W32`` or ``INSTALL.W64``. We used the option
``enable-static-engine`` as described in the instructions.
.. The actual commands used were::
- perl Configure VC-WIN32 no-asm enable-static-engine
--prefix=C:\Libraries\openssl-1.0.0d.win32
+ perl Configure VC-WIN32 no-asm enable-static-engine
--prefix=C:\Libraries\openssl-1.0.1b.win32
ms\do_ms.bat
nmake /f ms\ntdll.mak
nmake /f ms\ntdll.mak install
and::
- perl Configure VC-WIN64A enable-static-engine
--prefix=C:\Libraries\openssl-1.0.0d.win64
+ perl Configure VC-WIN64A enable-static-engine
--prefix=C:\Libraries\openssl-1.0.1b.win64
ms\do_win64a
nmake /f ms\ntdll.mak
nmake /f ms\ntdll.mak install
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -729,6 +729,7 @@ str ALGsemijoin(int *result, int *lid, i
str ALGsintersect(int *result, int *lid, int *rid);
str ALGslice(int *ret, bat *bid, lng *start, lng *end);
str ALGslice_int(int *ret, bat *bid, int *start, int *end);
+str ALGslice_oid(int *ret, bat *bid, oid *start, oid *end);
str ALGslice_wrd(int *ret, bat *bid, wrd *start, wrd *end);
str ALGsplit(int *result, int *bid);
str ALGssort(int *result, int *bid);
@@ -1353,94 +1354,26 @@ str CMDclearTrace(int *res);
str CMDcloseProfilerStream(int *res);
str CMDclrFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDclrFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pc);
-str CMDconvert_bit(int *ret, int *bid);
-str CMDconvert_bit_bte(int *ret, int *bid);
-str CMDconvert_bit_int(int *ret, int *bid);
-str CMDconvert_bit_lng(int *ret, int *bid);
-str CMDconvert_bit_sht(int *ret, int *bid);
-str CMDconvert_bit_str(int *ret, int *bid);
-str CMDconvert_bit_wrd(int *ret, int *bid);
-str CMDconvert_bte(int *ret, int *bid);
-str CMDconvert_bte_bit(int *ret, int *bid);
-str CMDconvert_bte_dbl(int *ret, int *bid);
-str CMDconvert_bte_flt(int *ret, int *bid);
-str CMDconvert_bte_int(int *ret, int *bid);
-str CMDconvert_bte_lng(int *ret, int *bid);
-str CMDconvert_bte_oid(int *ret, int *bid);
-str CMDconvert_bte_sht(int *ret, int *bid);
-str CMDconvert_bte_str(int *ret, int *bid);
-str CMDconvert_bte_wrd(int *ret, int *bid);
-str CMDconvert_dbl(int *ret, int *bid);
-str CMDconvert_dbl_bte(int *ret, int *bid);
-str CMDconvert_dbl_flt(int *ret, int *bid);
-str CMDconvert_dbl_int(int *ret, int *bid);
-str CMDconvert_dbl_lng(int *ret, int *bid);
-str CMDconvert_dbl_sht(int *ret, int *bid);
-str CMDconvert_dbl_str(int *ret, int *bid);
-str CMDconvert_dbl_wrd(int *ret, int *bid);
-str CMDconvert_flt(int *ret, int *bid);
-str CMDconvert_flt_bte(int *ret, int *bid);
-str CMDconvert_flt_dbl(int *ret, int *bid);
-str CMDconvert_flt_int(int *ret, int *bid);
-str CMDconvert_flt_lng(int *ret, int *bid);
-str CMDconvert_flt_sht(int *ret, int *bid);
-str CMDconvert_flt_str(int *ret, int *bid);
-str CMDconvert_flt_wrd(int *ret, int *bid);
-str CMDconvert_int(int *ret, int *bid);
-str CMDconvert_int_bit(int *ret, int *bid);
-str CMDconvert_int_bte(int *ret, int *bid);
-str CMDconvert_int_dbl(int *ret, int *bid);
-str CMDconvert_int_flt(int *ret, int *bid);
-str CMDconvert_int_lng(int *ret, int *bid);
-str CMDconvert_int_oid(int *ret, int *bid);
-str CMDconvert_int_sht(int *ret, int *bid);
-str CMDconvert_int_str(int *ret, int *bid);
-str CMDconvert_int_wrd(int *ret, int *bid);
-str CMDconvert_lng(int *ret, int *bid);
-str CMDconvert_lng_bit(int *ret, int *bid);
-str CMDconvert_lng_bte(int *ret, int *bid);
-str CMDconvert_lng_dbl(int *ret, int *bid);
-str CMDconvert_lng_flt(int *ret, int *bid);
-str CMDconvert_lng_int(int *ret, int *bid);
-str CMDconvert_lng_oid(int *ret, int *bid);
-str CMDconvert_lng_sht(int *ret, int *bid);
-str CMDconvert_lng_str(int *ret, int *bid);
-str CMDconvert_lng_wrd(int *ret, int *bid);
-str CMDconvert_oid(int *ret, int *bid);
-str CMDconvert_oid_bte(int *ret, int *bid);
-str CMDconvert_oid_dbl(int *ret, int *bid);
-str CMDconvert_oid_flt(int *ret, int *bid);
-str CMDconvert_oid_int(int *ret, int *bid);
-str CMDconvert_oid_lng(int *ret, int *bid);
-str CMDconvert_oid_sht(int *ret, int *bid);
-str CMDconvert_oid_wrd(int *ret, int *bid);
-str CMDconvert_sht(int *ret, int *bid);
-str CMDconvert_sht_bit(int *ret, int *bid);
-str CMDconvert_sht_bte(int *ret, int *bid);
-str CMDconvert_sht_dbl(int *ret, int *bid);
-str CMDconvert_sht_flt(int *ret, int *bid);
-str CMDconvert_sht_int(int *ret, int *bid);
-str CMDconvert_sht_lng(int *ret, int *bid);
-str CMDconvert_sht_oid(int *ret, int *bid);
-str CMDconvert_sht_str(int *ret, int *bid);
-str CMDconvert_sht_wrd(int *ret, int *bid);
-str CMDconvert_str(int *ret, int *bid);
-str CMDconvert_str_bit(int *ret, int *bid);
-str CMDconvert_str_bte(int *ret, int *bid);
-str CMDconvert_str_dbl(int *ret, int *bid);
-str CMDconvert_str_flt(int *ret, int *bid);
-str CMDconvert_str_int(int *ret, int *bid);
-str CMDconvert_str_lng(int *ret, int *bid);
-str CMDconvert_str_sht(int *ret, int *bid);
-str CMDconvert_wrd(int *ret, int *bid);
-str CMDconvert_wrd_bit(int *ret, int *bid);
-str CMDconvert_wrd_bte(int *ret, int *bid);
-str CMDconvert_wrd_dbl(int *ret, int *bid);
-str CMDconvert_wrd_flt(int *ret, int *bid);
-str CMDconvert_wrd_int(int *ret, int *bid);
-str CMDconvert_wrd_lng(int *ret, int *bid);
-str CMDconvert_wrd_oid(int *ret, int *bid);
-str CMDconvert_wrd_sht(int *ret, int *bid);
+str CMDconvert_bit(bat *ret, bat *bid);
+str CMDconvert_bte(bat *ret, bat *bid);
+str CMDconvert_dbl(bat *ret, bat *bid);
+str CMDconvert_flt(bat *ret, bat *bid);
+str CMDconvert_int(bat *ret, bat *bid);
+str CMDconvert_lng(bat *ret, bat *bid);
+str CMDconvert_oid(bat *ret, bat *bid);
+str CMDconvert_sht(bat *ret, bat *bid);
+str CMDconvert_str(bat *ret, bat *bid);
+str CMDconvert_wrd(bat *ret, bat *bid);
+str CMDconvertsignal_bit(bat *ret, bat *bid);
+str CMDconvertsignal_bte(bat *ret, bat *bid);
+str CMDconvertsignal_dbl(bat *ret, bat *bid);
+str CMDconvertsignal_flt(bat *ret, bat *bid);
+str CMDconvertsignal_int(bat *ret, bat *bid);
+str CMDconvertsignal_lng(bat *ret, bat *bid);
+str CMDconvertsignal_oid(bat *ret, bat *bid);
+str CMDconvertsignal_sht(bat *ret, bat *bid);
+str CMDconvertsignal_str(bat *ret, bat *bid);
+str CMDconvertsignal_wrd(bat *ret, bat *bid);
str CMDdeactivateProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDdebug(int *ret, int *flg);
str CMDdumpTrace(int *res);
@@ -2362,6 +2295,7 @@ str OPTstrengthReduction(Client cntxt, M
str OPTtrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str OPTtraceCall(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str OPTvector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str OPTvectorOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str PCREcompile_wrap(pcre **res, str *pattern);
str PCREexec_wrap(bit *res, pcre *pattern, str *s);
str PCREfromstr(str instr, int *l, pcre **val);
@@ -3152,6 +3086,7 @@ int canBeJoinselectProp;
str catalogRef;
str catchKernelException(Client cntxt, str ret);
str centipedeRef;
+int charCst(Client cntxt, ValPtr val);
void chkDeclarations(stream *out, MalBlkPtr mb);
void chkFlow(stream *out, MalBlkPtr mb);
void chkInstruction(stream *out, Module s, MalBlkPtr mb, InstrPtr p);
@@ -3335,7 +3270,6 @@ str getTypeName(malType tpe);
lng getUserTime(void);
str getVarName(MalBlkPtr mb, int i);
wrd getVarRows(MalBlkPtr mb, int v);
-lng getVolume(MalStkPtr stk, InstrPtr pci, int rd);
MalBlkPtr gotoMalBlkMarker(MalBlkPtr mb, str marker);
str grabRef;
str groupRef;
@@ -3560,6 +3494,7 @@ Plant newPlant(MalBlkPtr mb);
int newProperty(MalBlkPtr mb);
InstrPtr newRaiseStmt(MalBlkPtr mb, str nme);
str newRef;
+InstrPtr newReturnStmt(MalBlkPtr mb);
InstrPtr newStmt(MalBlkPtr mb, char *module, char *name);
InstrPtr newStmt1(MalBlkPtr mb, str module, char *name);
InstrPtr newStmt2(MalBlkPtr mb, str module, char *name);
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2656,7 +2656,6 @@ AC_CHECK_FUNCS([\
strtoll \
strtoull \
sysconf \
- task_for_pid \
task_info \
times \
trunc \
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2194,7 +2194,7 @@ gdk_export void *GDKmmap(char *path, int
gdk_export size_t GDK_mem_bigsize; /* size after which we use anonymous VM
rather than malloc */
gdk_export size_t GDK_mem_maxsize; /* max allowed size of committed memory
*/
gdk_export size_t GDK_vm_maxsize; /* max allowed size of reserved vm */
-gdk_export int GDK_vm_trim; /* run vmtrim thread */
+gdk_export int GDK_vm_trim; /* allow trimming */
gdk_export size_t GDKmem_inuse(void); /* RAM/swapmem that MonetDB is really
using now */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
