Changeset: f6295c2f6c75 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6295c2f6c75
Modified Files:
configure.ag
monetdb5/mal/mal_interpreter.mx
monetdb5/modules/kernel/algebra.mx
Branch: jacqueline
Log Message:
Merged from default
diffs (truncated from 2739 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -471,3 +471,4 @@ 6dbadba38a4635b6319f2ba966f5dde6efab037d
32665cf67d03011ff1fcc2c8e118370c47e5fae6 Dec2011_release
d159bb1ba293002773b896353854b14aeb4e5cd1 Dec2011_7
f47248f30989933b245a4d6f2e31a9e443f1078b Dec2011_SP1_release
+ab662699300b790a0c20b3c40b6ca0eebf25cd14 Apr2012_root
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.8.0
+%define version 11.10.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
# groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.8.0"
+ "ProductVersion" = "8:11.10.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.8.0"
+ "ProductVersion" = "8:11.10.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -2829,7 +2829,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.8.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3629,7 +3629,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.8.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5213,7 +5213,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.8.0"
+ "Name" = "8:MonetDB-SQL-11.10.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5263,7 +5263,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.8.0"
+ "ProductVersion" = "8:11.10.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -573,7 +573,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.8.0"
+ "ProductVersion" = "8:11.10.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -432,7 +432,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.8.0"
+ "ProductVersion" = "8:11.10.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
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
@@ -2769,7 +2769,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.8.0\\dump-restore.txt"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3809,7 +3809,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.8.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.10.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5213,7 +5213,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.8.0"
+ "Name" = "8:MonetDB-SQL-11.10.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5263,7 +5263,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.8.0"
+ "ProductVersion" = "8:11.10.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -737,13 +737,13 @@
#define PACKAGE_NAME "MonetDB"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.8.0"
+#define PACKAGE_STRING "MonetDB 11.10.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.8.0"
+#define PACKAGE_VERSION "11.10.0"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.8.0
+VERSION=11.10.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Apr2012
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Apr2012
diff --git a/clients/ChangeLog b/clients/ChangeLog.Apr2012
copy from clients/ChangeLog
copy to clients/ChangeLog.Apr2012
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
@@ -624,24 +624,24 @@ str ALGprod_wrd_wrd(wrd *res, int *bid,
str ALGprojectCst(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGprojectCstBody(bat *result, int *bid, ptr *p, int tt);
str ALGprojectNIL(int *ret, int *bid);
-str ALGprojecthead_bit(int *ret, ptr *val, int *bid);
-str ALGprojecthead_bte(int *ret, ptr *val, int *bid);
-str ALGprojecthead_dbl(int *ret, ptr *val, int *bid);
-str ALGprojecthead_flt(int *ret, ptr *val, int *bid);
-str ALGprojecthead_int(int *ret, ptr *val, int *bid);
-str ALGprojecthead_lng(int *ret, ptr *val, int *bid);
-str ALGprojecthead_oid(int *ret, ptr *val, int *bid);
-str ALGprojecthead_sht(int *ret, ptr *val, int *bid);
-str ALGprojecthead_str(int *ret, ptr *val, int *bid);
-str ALGprojecttail_bit(int *ret, int *bid, ptr *val);
-str ALGprojecttail_bte(int *ret, int *bid, ptr *val);
-str ALGprojecttail_dbl(int *ret, int *bid, ptr *val);
-str ALGprojecttail_flt(int *ret, int *bid, ptr *val);
-str ALGprojecttail_int(int *ret, int *bid, ptr *val);
-str ALGprojecttail_lng(int *ret, int *bid, ptr *val);
-str ALGprojecttail_oid(int *ret, int *bid, ptr *val);
-str ALGprojecttail_sht(int *ret, int *bid, ptr *val);
-str ALGprojecttail_str(int *ret, int *bid, ptr *val);
+str ALGprojecthead_bit(int *ret, bit *val, int *bid);
+str ALGprojecthead_bte(int *ret, bte *val, int *bid);
+str ALGprojecthead_dbl(int *ret, dbl *val, int *bid);
+str ALGprojecthead_flt(int *ret, flt *val, int *bid);
+str ALGprojecthead_int(int *ret, int *val, int *bid);
+str ALGprojecthead_lng(int *ret, lng *val, int *bid);
+str ALGprojecthead_oid(int *ret, oid *val, int *bid);
+str ALGprojecthead_sht(int *ret, sht *val, int *bid);
+str ALGprojecthead_str(int *ret, str *val, int *bid);
+str ALGprojecttail_bit(int *ret, int *bid, bit *val);
+str ALGprojecttail_bte(int *ret, int *bid, bte *val);
+str ALGprojecttail_dbl(int *ret, int *bid, dbl *val);
+str ALGprojecttail_flt(int *ret, int *bid, flt *val);
+str ALGprojecttail_int(int *ret, int *bid, int *val);
+str ALGprojecttail_lng(int *ret, int *bid, lng *val);
+str ALGprojecttail_oid(int *ret, int *bid, oid *val);
+str ALGprojecttail_sht(int *ret, int *bid, sht *val);
+str ALGprojecttail_str(int *ret, int *bid, str *val);
str ALGrangejoin(int *result, int *lid, int *rlid, int *rhid, bit *li, bit
*hi);
str ALGrangesplit(int *result, int *bid, int *nfrag);
str ALGreuse(int *ret, int *bid);
@@ -5302,7 +5302,7 @@ str ZORDsql_slice_int(int *r, int *xb, i
void _initTrace(void);
str activateCounter(str name);
str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
-str addPipeDefinition(str name, str pipe);
+str addPipeDefinition(Client cntxt, str name, str pipe);
str addRegWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc);
DCYcatalog *addRegist(str sch, str tab, str col, int acc, int part, int f_bun,
int l_bun);
void addtoMalBlkHistory(MalBlkPtr mb, str marker);
@@ -5414,6 +5414,7 @@ int color_tostr(char **colorStr, int *le
str columnBindRef;
str columnRef;
str commitRef;
+str compileOptimizer(Client cntxt, str name);
str compileString(Symbol *fcn, Client c, str s);
str compressRef;
str connectRef;
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2878,9 +2878,10 @@ main(int argc, char **argv)
current `c' is based on and see if we recognize
it: if -? or --help, exit with 0, else with -1 */
usage(argv[0], strcmp(argv[optind - 1], "-?") == 0 ||
strcmp(argv[optind - 1], "--help") == 0 ? 0 : -1);
- break;
+ /* not reached */
default:
usage(argv[0], -1);
+ /* not reached */
}
}
#ifdef HAVE_ICONV
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,8,0,1
- PRODUCTVERSION 11,8,0,1
+ FILEVERSION 11,10,0,1
+ PRODUCTVERSION 11,10,0,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "CWI\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.8.0\0"
+ VALUE "FileVersion", "11.10.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.8.0\0"
+ VALUE "ProductVersion", "11.10.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
diff --git a/clients/odbc/driver/ODBCConvert.c
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -1894,7 +1894,7 @@ ODBCFetch(ODBCStmt *stmt,
addStmtError(stmt, "07006", NULL, 0);
return SQL_ERROR;
}
- break;
+ /* break; -- not reached */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
