Changeset: 02335fdfe31a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02335fdfe31a
Modified Files:
HowToStart.rst
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/rules.msc
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/monetdb.R
clients/R/Tests/dbi.R
clients/R/Tests/dplyr.R
clients/R/Tests/survey.R
debian/control
debian/monetdb5-server.install
debian/monetdb5-sql.install
debian/rules
monetdb5/extras/rapi/rapi.c
testing/Mtest.py.in
tools/merovingian/daemon/Makefile.ag
Branch: transaction-replication
Log Message:
Merge with default branch
diffs (truncated from 1699 to 300 lines):
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -123,9 +123,8 @@ standard software development tools
- a lexical analyzer generator (e.g., ``lex`` or ``flex``);
- a parser generator (e.g., ``yacc`` or ``bison``).
- If ``lex`` and ``flex`` are missing, you won't be able to
- build the jaql front end. If ``yacc`` and ``bison`` are
- missing, you won't be able to build the SQL front end.
+ If ``yacc`` and ``bison`` are missing, you won't be able to
+ build the SQL front end.
The following are optional. They are checked for during
configuration and if they are missing, the feature is just
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
@@ -21,6 +21,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_0341F375A2D14CB9AA258F9C7F59D853"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_03431EDC85094776AD217020CB3E26D4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -153,6 +159,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_1DA15FCBB5174B64968065B5F8CB8FAF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_1FE7B02CBBA5493DA5E90CC441A198FC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -393,6 +405,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_6744DD54759747BB94C0943D9C977128"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_6BAB624B0B2F474D8B88C92453C4DA9A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -729,6 +747,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_B9D1DA07F5504E5AB87B5629EA7D49E0"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_BE303DEAED0D4E118580EE3384FBE335"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1040,6 +1064,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0341F375A2D14CB9AA258F9C7F59D853"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\generator.mal"
+ "TargetName" = "8:generator.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}:_03431EDC85094776AD217020CB3E26D4"
{
"SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib"
@@ -1480,6 +1524,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1DA15FCBB5174B64968065B5F8CB8FAF"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\90_generator.sql"
+ "TargetName" = "8:90_generator.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "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}:_1FE7B02CBBA5493DA5E90CC441A198FC"
{
"SourcePath" = "8:banner.bmp"
@@ -2280,6 +2344,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6744DD54759747BB94C0943D9C977128"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\lib_generator.dll"
+ "TargetName" = "8:lib_generator.dll"
+ "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}:_6BAB624B0B2F474D8B88C92453C4DA9A"
{
"SourcePath" = "8:lib\\monetdb5\\mal_init.mal"
@@ -3380,6 +3464,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B9D1DA07F5504E5AB87B5629EA7D49E0"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\autoload\\90_generator.mal"
+ "TargetName" = "8:90_generator.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
+ "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}:_BE303DEAED0D4E118580EE3384FBE335"
{
"SourcePath" = "8:lib\\monetdb5\\sql_decimal.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
@@ -165,6 +165,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_20010CE6E76146F89F63A74CC08152A7"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_210ACB4F1EA444B4B72F5B60E9953FEE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -291,6 +297,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_40582CCB92F24F6BA7002DDCF329D0B1"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_40B3CCBB396946BD83B94632ACE1A8D4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -921,6 +933,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_F58F05F076D74EB3BE305C1F69EBA887"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_F671CE9CE9A64006AFFFAFBCBDA8EDCE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -933,6 +951,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_F8836AF14D4545419923AF09AE7A8AF9"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_FDB25DD18EBB4108A434FAC048EDF8D1"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1520,6 +1544,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_20010CE6E76146F89F63A74CC08152A7"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\lib_generator.dll"
+ "TargetName" = "8:lib_generator.dll"
+ "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}:_210ACB4F1EA444B4B72F5B60E9953FEE"
{
"SourcePath" = "8:mclient.bat"
@@ -1940,6 +1984,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_40582CCB92F24F6BA7002DDCF329D0B1"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\90_generator.sql"
+ "TargetName" = "8:90_generator.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "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}:_40B3CCBB396946BD83B94632ACE1A8D4"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\11_times.sql"
@@ -4020,6 +4084,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F58F05F076D74EB3BE305C1F69EBA887"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\generator.mal"
+ "TargetName" = "8:generator.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
