Changeset: d191c2cd1350 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d191c2cd1350
Modified Files:
common/options/monet_options.mx
gdk/gdk_align.mx
gdk/gdk_delta.mx
gdk/gdk_heap.mx
gdk/gdk_logger.mx
gdk/gdk_posix.mx
gdk/gdk_storage.mx
gdk/gdk_system.mx
gdk/gdk_tm.mx
geom/lib/libgeom.mx
monetdb5/modules/mal/mat.mx
monetdb5/optimizer/opt_slicing.mx
sql/backends/monet5/datacell/actuator.mx
sql/backends/monet5/datacell/basket.mx
sql/backends/monet5/datacell/datacell.mx
sql/backends/monet5/datacell/dcoperator.mx
sql/backends/monet5/datacell/dcsocket.mx
sql/backends/monet5/datacell/emitter.mx
sql/backends/monet5/datacell/opt_datacell.mx
sql/backends/monet5/datacell/petrinet.mx
sql/backends/monet5/datacell/receptor.mx
sql/backends/monet5/datacell/sensor.mx
sql/backends/monet5/sql_bpm.mx
sql/backends/monet5/sql_emptyset.mx
sql/backends/monet5/sql_gencode.mx
sql/backends/monet5/sql_optimizer.mx
sql/backends/monet5/sql_readline.mx
sql/backends/monet5/sql_scenario.mx
sql/backends/monet5/sql_user.mx
sql/backends/monet5/vaults/fits.mx
sql/backends/monet5/vaults/mseed.mx
sql/backends/monet5/vaults/vault.mx
template/src/monetdb5/example.mx
Branch: default
Log Message:
Merge with default
diffs (truncated from 16014 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -443,3 +443,4 @@
ff43c1f6f50cf795cf12b9336f74fd86686a5fd6 Apr2011_1
1833949cae477d8f1efde8caea6608c04f67ad6d Apr2011_3
c8a6189f95ae3d7cfb8d14f3b002c1077a4c437c Apr2011_SP1_release
+b540445f1e7aa333708963a7afb46acd1914fdb3 Aug2011_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.4.0
+%define version 11.6.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.4.0"
+ "ProductVersion" = "8:11.6.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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.4.0"
+ "ProductVersion" = "8:11.6.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -2659,7 +2659,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.4.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.6.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3679,7 +3679,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.4.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.6.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5083,7 +5083,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.4.0"
+ "Name" = "8:MonetDB-SQL-11.6.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5132,7 +5132,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.4.0"
+ "ProductVersion" = "8:11.6.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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.4.0"
+ "ProductVersion" = "8:11.6.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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.4.0"
+ "ProductVersion" = "8:11.6.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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
@@ -2659,7 +2659,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.4.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.6.0\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3679,7 +3679,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.4.0\\dump-restore.html"
+ "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.6.0\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -5083,7 +5083,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.4.0"
+ "Name" = "8:MonetDB-SQL-11.6.0"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
@@ -5132,7 +5132,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:11.4.0"
+ "ProductVersion" = "8:11.6.0"
"Manufacturer" = "8:MonetDB"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:http://monetdb.cwi.nl/";
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-2011 MonetDB B.V.
# All Rights Reserved.
-VERSION=11.4.0
+VERSION=11.6.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Aug2011
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Aug2011
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,8 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Mon Apr 18 2011 Fabian Groffen <fab...@cwi.nl>
-- When the first non-option argument of mclient does not refer to an
- exising file, it now is taken as database name. This allows to simply
- do `mclient mydb`.
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Aug2011
copy from clients/ChangeLog
copy to clients/ChangeLog.Aug2011
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -49,7 +49,8 @@
NOINST
SOURCES = mnc.c
LIBS = ../../common/stream/libstream \
- $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS)
+ ../mapilib/libmapi \
+ $(curl_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(SOCKET_LIBS)
}
man_MANS = mclient.1 msqldump.1
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -41,8 +41,15 @@
#include <pthread.h>
#endif
#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#ifdef NATIVE_WIN32
+# include <winsock.h>
+#endif
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
#ifndef HAVE_GETOPT_LONG
# include "monet_getopt.h"
@@ -81,9 +88,9 @@
char *host = NULL;
int port = 0;
char clisten = 0;
- char udp = 0;
- char zip = 0;
- char buffer = 0;
+ /* char udp = 0; */
+ /* char zip = 0; */
+ /* char buffer = 0; */
char block = 0;
SOCKET s = INVALID_SOCKET;
stream *in = NULL;
@@ -113,16 +120,16 @@
clisten = 1;
break;
case 'u':
- udp = 1;
+ /* udp = 1; */
break;
case 'g':
- zip = 1;
+ /* zip = 1; */
break;
case 'j':
- zip = 2;
+ /* zip = 2; */
break;
case 'b':
- buffer = 1;
+ /* buffer = 1; */
break;
case 'B':
block = 1;
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -3287,19 +3287,19 @@
switch (hdl->params[i].intype) {
case MAPI_TINY:
checkSpace(5);
- sprintf(hdl->query + k, "%d", *(signed char *)
src);
+ sprintf(hdl->query + k, "%hhd", *(signed char
*) src);
break;
case MAPI_UTINY:
checkSpace(5);
- sprintf(hdl->query + k, "%u", *(unsigned char
*) src);
+ sprintf(hdl->query + k, "%hhu", *(unsigned char
*) src);
break;
case MAPI_SHORT:
checkSpace(10);
- sprintf(hdl->query + k, "%d", *(short *) src);
+ sprintf(hdl->query + k, "%hd", *(short *) src);
break;
case MAPI_USHORT:
checkSpace(10);
- sprintf(hdl->query + k, "%u", *(unsigned short
*) src);
+ sprintf(hdl->query + k, "%hu", *(unsigned short
*) src);
break;
case MAPI_INT:
checkSpace(20);
@@ -3336,7 +3336,7 @@
case MAPI_DATE:
checkSpace(50);
sprintf(hdl->query + k,
- "DATE '%04d-%02u-%02u'",
+ "DATE '%04hd-%02hu-%02hu'",
((MapiDate *) src)->year,
((MapiDate *) src)->month,
((MapiDate *) src)->day);
@@ -3344,7 +3344,7 @@
case MAPI_TIME:
checkSpace(60);
sprintf(hdl->query + k,
- "TIME '%02u:%02u:%02u'",
+ "TIME '%02hu:%02hu:%02hu'",
((MapiTime *) src)->hour,
((MapiTime *) src)->minute,
((MapiTime *) src)->second);
@@ -3352,7 +3352,7 @@
case MAPI_DATETIME:
checkSpace(110);
sprintf(hdl->query + k,
- "TIMESTAMP '%04d-%02u-%02u
%02u:%02u:%02u.%09u'",
+ "TIMESTAMP '%04hd-%02hu-%02hu
%02hu:%02hu:%02hu.%09u'",
((MapiDateTime *) src)->year,
((MapiDateTime *) src)->month,
((MapiDateTime *) src)->day,
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 @@
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
