Changeset: 32c057d2a4ea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32c057d2a4ea
Modified Files:
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
sql/backends/monet5/gsl/Tests/gsl01.sql
sql/backends/monet5/gsl/Tests/gsl01.stable.err
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 305 to 300 lines):
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
@@ -229,7 +229,7 @@
"SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win32\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
- "Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
+ "Folder" = "8:_272635DA3D924F9CB05C410645076698"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -331,6 +331,17 @@
"Property" = "8:NEWPROPERTY1"
"Folders"
{
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_272635DA3D924F9CB05C410645076698"
+ {
+ "Name" = "8:bin"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_4D04B65294AD4B5CBCD4EE336AF9B51A"
+ "Folders"
+ {
+ }
+ }
"{9EF0B969-E518-4E46-987F-47570745A589}:_4D9CE65EDD774551869CFD46B59B4F9E"
{
"Name" = "8:lib"
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
@@ -1229,7 +1229,7 @@
"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1329,7 +1329,7 @@
"SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win32\\bin\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1749,7 +1749,7 @@
"SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2069,7 +2069,7 @@
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2149,7 +2149,7 @@
"SourcePath" = "8:C:\\Libraries\\pcre-8.36.win32\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2749,7 +2749,7 @@
"SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3329,7 +3329,7 @@
"SourcePath" = "8:lib\\libmapi.dll"
"TargetName" = "8:libmapi.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3349,7 +3349,7 @@
"SourcePath" = "8:lib\\libbat.dll"
"TargetName" = "8:libbat.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3789,7 +3789,7 @@
"SourcePath" = "8:lib\\libmonetdb5.dll"
"TargetName" = "8:libmonetdb5.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3869,7 +3869,7 @@
"SourcePath" = "8:lib\\libstream.dll"
"TargetName" = "8:libstream.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -4009,7 +4009,7 @@
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
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
@@ -229,7 +229,7 @@
"SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win64\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
- "Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
+ "Folder" = "8:_5A4CF78A6BC241B6AAEFF30075ECAE13"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -375,6 +375,17 @@
}
}
}
+
"{9EF0B969-E518-4E46-987F-47570745A589}:_5A4CF78A6BC241B6AAEFF30075ECAE13"
+ {
+ "Name" = "8:bin"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_8243C459978C4243AD7AACC0339F371E"
+ "Folders"
+ {
+ }
+ }
}
}
"{3C67513D-01DD-4637-8A68-80971EB9504F}:_D9A7267FC9784D8BBD3CBC6EC1754DBE"
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
@@ -1209,7 +1209,7 @@
"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win64\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1309,7 +1309,7 @@
"SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win64\\bin\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -1729,7 +1729,7 @@
"SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2069,7 +2069,7 @@
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2149,7 +2149,7 @@
"SourcePath" = "8:C:\\Libraries\\pcre-8.36.win64\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -2729,7 +2729,7 @@
"SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3309,7 +3309,7 @@
"SourcePath" = "8:lib\\libmapi.dll"
"TargetName" = "8:libmapi.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3329,7 +3329,7 @@
"SourcePath" = "8:lib\\libbat.dll"
"TargetName" = "8:libbat.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3749,7 +3749,7 @@
"SourcePath" = "8:lib\\libmonetdb5.dll"
"TargetName" = "8:libmonetdb5.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3829,7 +3829,7 @@
"SourcePath" = "8:lib\\libstream.dll"
"TargetName" = "8:libstream.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -3969,7 +3969,7 @@
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
diff --git a/sql/backends/monet5/gsl/Tests/gsl01.sql
b/sql/backends/monet5/gsl/Tests/gsl01.sql
--- a/sql/backends/monet5/gsl/Tests/gsl01.sql
+++ b/sql/backends/monet5/gsl/Tests/gsl01.sql
@@ -1,12 +1,12 @@
-SELECT gsl.chi2prob(20.0, 5.0);
+SELECT sys.chi2prob(20.0, 5.0);
-SELECT gsl.chi2prob(20.0, NULL);
+SELECT sys.chi2prob(20.0, NULL);
-SELECT gsl.chi2prob(NULL, 5.0);
+SELECT sys.chi2prob(NULL, 5.0);
-SELECT gsl.chi2prob(-1, 5.0);
+SELECT sys.chi2prob(-1, 5.0);
-SELECT gsl.chi2prob(20.0, 1.0);
+SELECT sys.chi2prob(20.0, 1.0);
CREATE TABLE chi2(a double, b double);
diff --git a/sql/backends/monet5/gsl/Tests/gsl01.stable.err
b/sql/backends/monet5/gsl/Tests/gsl01.stable.err
--- a/sql/backends/monet5/gsl/Tests/gsl01.stable.err
+++ b/sql/backends/monet5/gsl/Tests/gsl01.stable.err
@@ -29,13 +29,13 @@ stderr of test 'gsl01` in directory 'sql
# 15:57:56 >
MAPI = (monetdb) /var/tmp/mtest-28608/.s.monetdb.36472
-QUERY = SELECT gsl.chi2prob(20.0, NULL);
+QUERY = SELECT sys.chi2prob(20.0, NULL);
ERROR = !Wrong value for datapoints
MAPI = (monetdb) /var/tmp/mtest-28608/.s.monetdb.36472
-QUERY = SELECT gsl.chi2prob(NULL, 5.0);
+QUERY = SELECT sys.chi2prob(NULL, 5.0);
ERROR = !Wrong value for chi2
MAPI = (monetdb) /var/tmp/mtest-28608/.s.monetdb.36472
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
