Changeset: 00573d4d963d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00573d4d963d
Added Files:
clients/Tests/MAL-signatures.malC
clients/Tests/MAL-signatures.stable.err
clients/Tests/MAL-signatures.stable.out
clients/Tests/SQL-dump.sql
clients/Tests/SQL-dump.stable.err
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.oid32
sql/scripts/41_md5sum.sql
Removed Files:
clients/Tests/MAL-signatures_all.malC
clients/Tests/MAL-signatures_all.stable.err
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.malC.src
clients/Tests/MAL-signatures_fits_geom.stable.err
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_geom.malC.src
clients/Tests/MAL-signatures_geom.stable.err
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_none.malC.src
clients/Tests/MAL-signatures_none.stable.err
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/SQL-dump_all.sql
clients/Tests/SQL-dump_all.stable.err
clients/Tests/SQL-dump_all.stable.out
clients/Tests/SQL-dump_all.stable.out.int128
clients/Tests/SQL-dump_all.stable.out.oid32
clients/Tests/SQL-dump_all.stable.out.oid32.int128
clients/Tests/SQL-dump_geom.sql.src
clients/Tests/SQL-dump_geom.stable.err
clients/Tests/SQL-dump_geom.stable.out
clients/Tests/SQL-dump_geom.stable.out.32bit
clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
clients/Tests/SQL-dump_none.sql.src
clients/Tests/SQL-dump_none.stable.err
clients/Tests/SQL-dump_none.stable.out
sql/jdbc/tests/Tests/Test_Dobjects.SQL.bat
sql/jdbc/tests/Tests/Test_Dobjects_bam.SQL.sh
sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.err
sql/jdbc/tests/Tests/Test_Dobjects_bam.stable.out
sql/scripts/41_jsonstore.sql
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.sql.src
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.err
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063_bam.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.sql.src
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.err
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063_bam.stable.out
sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src
sql/test/Dependencies/Tests/Dependencies_bam.stable.err
sql/test/Dependencies/Tests/Dependencies_bam.stable.out
sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128
sql/test/Tests/keys_bam.sql.src
sql/test/Tests/keys_bam.stable.err
sql/test/Tests/keys_bam.stable.out
sql/test/Tests/systemfunctions_bam.sql.src
sql/test/Tests/systemfunctions_bam.stable.err
sql/test/Tests/systemfunctions_bam.stable.out
sql/test/Tests/systemfunctions_bam.stable.out.int128
sql/test/Tests/systemfunctions_gsl.sql.src
sql/test/Tests/systemfunctions_gsl.stable.err
sql/test/Tests/systemfunctions_gsl.stable.out
sql/test/Tests/systemfunctions_nogeom.sql.src
sql/test/Tests/systemfunctions_nogeom.stable.err
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/Tests/trace_nogeom.sql.src
sql/test/Tests/trace_nogeom.stable.err
sql/test/Tests/trace_nogeom.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.sql.src
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.stable.err
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566_bam.stable.out
sql/test/leaks/Tests/check0_bam.sql.src
sql/test/leaks/Tests/check0_bam.stable.err
sql/test/leaks/Tests/check0_bam.stable.out
sql/test/leaks/Tests/check0_bam.stable.out.int128
sql/test/leaks/Tests/check0_gsl.sql.src
sql/test/leaks/Tests/check0_gsl.stable.err
sql/test/leaks/Tests/check0_gsl.stable.out
sql/test/leaks/Tests/check0_nogeom.sql.src
sql/test/leaks/Tests/check0_nogeom.stable.err
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check1_bam.sql.src
sql/test/leaks/Tests/check1_bam.stable.err
sql/test/leaks/Tests/check1_bam.stable.out
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check1_gsl.sql.src
sql/test/leaks/Tests/check1_gsl.stable.err
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_nogeom.sql.src
sql/test/leaks/Tests/check1_nogeom.stable.err
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2_bam.sql.src
sql/test/leaks/Tests/check2_bam.stable.err
sql/test/leaks/Tests/check2_bam.stable.out
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check2_gsl.sql.src
sql/test/leaks/Tests/check2_gsl.stable.err
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_nogeom.sql.src
sql/test/leaks/Tests/check2_nogeom.stable.err
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3_bam.sql.src
sql/test/leaks/Tests/check3_bam.stable.err
sql/test/leaks/Tests/check3_bam.stable.out
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check3_gsl.sql.src
sql/test/leaks/Tests/check3_gsl.stable.err
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_nogeom.sql.src
sql/test/leaks/Tests/check3_nogeom.stable.err
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4_bam.sql.src
sql/test/leaks/Tests/check4_bam.stable.err
sql/test/leaks/Tests/check4_bam.stable.out
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check4_gsl.sql.src
sql/test/leaks/Tests/check4_gsl.stable.err
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_nogeom.sql.src
sql/test/leaks/Tests/check4_nogeom.stable.err
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5_bam.sql.src
sql/test/leaks/Tests/check5_bam.stable.err
sql/test/leaks/Tests/check5_bam.stable.out
sql/test/leaks/Tests/check5_bam.stable.out.int128
sql/test/leaks/Tests/check5_gsl.sql.src
sql/test/leaks/Tests/check5_gsl.stable.err
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_nogeom.sql.src
sql/test/leaks/Tests/check5_nogeom.stable.err
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3_bam.sql.src
sql/test/leaks/Tests/drop3_bam.stable.err
sql/test/leaks/Tests/drop3_bam.stable.out
sql/test/leaks/Tests/drop3_bam.stable.out.int128
sql/test/leaks/Tests/drop3_gsl.sql.src
sql/test/leaks/Tests/drop3_gsl.stable.err
sql/test/leaks/Tests/drop3_gsl.stable.out
sql/test/leaks/Tests/drop3_nogeom.sql.src
sql/test/leaks/Tests/drop3_nogeom.stable.err
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/select1_bam.sql.src
sql/test/leaks/Tests/select1_bam.stable.err
sql/test/leaks/Tests/select1_bam.stable.out
sql/test/leaks/Tests/select1_bam.stable.out.int128
sql/test/leaks/Tests/select1_gsl.sql.src
sql/test/leaks/Tests/select1_gsl.stable.err
sql/test/leaks/Tests/select1_gsl.stable.out
sql/test/leaks/Tests/select1_nogeom.sql.src
sql/test/leaks/Tests/select1_nogeom.stable.err
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select2_bam.sql.src
sql/test/leaks/Tests/select2_bam.stable.err
sql/test/leaks/Tests/select2_bam.stable.out
sql/test/leaks/Tests/select2_bam.stable.out.int128
sql/test/leaks/Tests/select2_gsl.sql.src
sql/test/leaks/Tests/select2_gsl.stable.err
sql/test/leaks/Tests/select2_gsl.stable.out
sql/test/leaks/Tests/select2_nogeom.sql.src
sql/test/leaks/Tests/select2_nogeom.stable.err
sql/test/leaks/Tests/select2_nogeom.stable.out
sql/test/leaks/Tests/temp1_bam.sql.src
sql/test/leaks/Tests/temp1_bam.stable.err
sql/test/leaks/Tests/temp1_bam.stable.out
sql/test/leaks/Tests/temp1_bam.stable.out.int128
sql/test/leaks/Tests/temp1_gsl.sql.src
sql/test/leaks/Tests/temp1_gsl.stable.err
sql/test/leaks/Tests/temp1_gsl.stable.out
sql/test/leaks/Tests/temp1_nogeom.sql.src
sql/test/leaks/Tests/temp1_nogeom.stable.err
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2_bam.sql.src
sql/test/leaks/Tests/temp2_bam.stable.err
sql/test/leaks/Tests/temp2_bam.stable.out
sql/test/leaks/Tests/temp2_bam.stable.out.int128
sql/test/leaks/Tests/temp2_gsl.sql.src
sql/test/leaks/Tests/temp2_gsl.stable.err
sql/test/leaks/Tests/temp2_gsl.stable.out
sql/test/leaks/Tests/temp2_nogeom.sql.src
sql/test/leaks/Tests/temp2_nogeom.stable.err
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3_bam.sql.src
sql/test/leaks/Tests/temp3_bam.stable.err
sql/test/leaks/Tests/temp3_bam.stable.out
sql/test/leaks/Tests/temp3_bam.stable.out.int128
sql/test/leaks/Tests/temp3_gsl.sql.src
sql/test/leaks/Tests/temp3_gsl.stable.err
sql/test/leaks/Tests/temp3_gsl.stable.out
sql/test/leaks/Tests/temp3_nogeom.sql.src
sql/test/leaks/Tests/temp3_nogeom.stable.err
sql/test/leaks/Tests/temp3_nogeom.stable.out
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/R/Tests/dbi.stable.out
clients/Tests/All
clients/Tests/SQL-dump_geom.stable.out.int128
clients/Tests/SQL-dump_geom.stable.out.oid32.int128
clients/Tests/SQL-dump_none.stable.out.int128
clients/ruby/adapter/activerecord-monetdb-adapter-0.1.gemspec
clients/ruby/ruby-monetdb-sql-0.1.gemspec
monetdb5/mal/mal.c
sql/backends/monet5/Tests/limithack.stable.out
sql/backends/monet5/Tests/rapi09.stable.out
sql/backends/monet5/bam/Tests/bam_loader_file.stable.out
sql/backends/monet5/bam/Tests/mergetable.stable.out
sql/backends/monet5/generator/Tests/generator00.stable.out
sql/backends/monet5/generator/Tests/rangejoin.stable.out
sql/backends/monet5/gsl/Tests/gsl01.stable.out
sql/backends/monet5/sql_upgrades.c
sql/benchmarks/nobench/Tests/nobench.stable.out
sql/jdbc/tests/Tests/All
sql/jdbc/tests/Tests/Test_Dobjects.SQL.sh
sql/jdbc/tests/Tests/Test_Dobjects.stable.err
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/Makefile.ag
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2012/Tests/All
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
sql/test/BugTracker-2013/Tests/Cannot_Find_Column_Type.Bug-3394.stable.out
sql/test/BugTracker-2013/Tests/copy-out-quote.Bug-3393.stable.out
sql/test/BugTracker-2013/Tests/json_is_null.Bug-3406.stable.out
sql/test/BugTracker-2013/Tests/nested_concat_query.Bug-3408.stable.out
sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out
sql/test/BugTracker-2013/Tests/recursion.stable.out
sql/test/BugTracker-2013/Tests/restore-uuid.Bug-3407.stable.out
sql/test/BugTracker-2014/Tests/BOM-in-string.Bug-3641.stable.out
sql/test/BugTracker-2014/Tests/aggr-with-limit.Bug-3498.stable.out
sql/test/BugTracker-2014/Tests/case-sqrt.Bug-3627.stable.out
sql/test/BugTracker-2014/Tests/column-with-comma.Bug-3616.stable.out
sql/test/BugTracker-2014/Tests/combined_WHERE_conditions.Bug-3642.stable.out
sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.stable.out
sql/test/BugTracker-2014/Tests/empty_intermediate_quantile.Bug-3611.stable.out
sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.out
sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out
sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128
sql/test/BugTracker-2014/Tests/insert_into_temp_table.Bug-3600.stable.out
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out
sql/test/BugTracker-2014/Tests/sign-sorted.Bug-3594.stable.out
sql/test/BugTracker-2014/Tests/stddev-empty.Bug-3628.stable.out
sql/test/BugTracker-2014/Tests/subselect-reverse.Bug-3552.stable.out
sql/test/BugTracker-2014/Tests/uppercaseboolean.Bug-3519.stable.out
sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.stable.out
sql/test/BugTracker-2015/Tests/incorrect-ROW_NUMBER.Bug-3663.stable.out
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.out
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.out
sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out
sql/test/BugTracker-2015/Tests/row-value-constructor-crash.Bug-3662.stable.out
sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.out
sql/test/BugTracker-2015/Tests/string-to-inet.Bug-3666.stable.out
sql/test/BugTracker-2015/Tests/with-columns-mismatch.Bug-3697.stable.out
sql/test/Dependencies/Tests/All
sql/test/Dependencies/Tests/Dependencies.SQL.py
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Tests/All
sql/test/Tests/keys.sql.src
sql/test/Tests/keys.stable.err
sql/test/Tests/keys.stable.out
sql/test/Tests/str-pad.stable.out
sql/test/Tests/str-trim.stable.out
sql/test/Tests/systemfunctions.sql
sql/test/Tests/systemfunctions.stable.err
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Tests/systemfunctions_gsl.stable.out.int128
sql/test/Tests/systemfunctions_nogeom.stable.out.int128
sql/test/Update_Delete_action/Tests/delete_cascade.stable.out
sql/test/bugs/Tests/All
sql/test/bugs/Tests/apply_with_union_assertion.stable.out
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.sql.src
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.err
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/json/Tests/aggregate00.stable.out
sql/test/json/Tests/aggregate01.stable.out
sql/test/json/Tests/bulklength.stable.out
sql/test/json/Tests/shop.stable.out
sql/test/json/Tests/spaceissue.stable.out
sql/test/leaks/Tests/All
sql/test/leaks/Tests/check0.sql
sql/test/leaks/Tests/check0.stable.err
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check0_gsl.stable.out.int128
sql/test/leaks/Tests/check0_nogeom.stable.out.int128
sql/test/leaks/Tests/check1.sql.src
sql/test/leaks/Tests/check1.stable.err
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.sql.src
sql/test/leaks/Tests/check2.stable.err
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.sql.src
sql/test/leaks/Tests/check3.stable.err
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.sql.src
sql/test/leaks/Tests/check4.stable.err
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.sql.src
sql/test/leaks/Tests/check5.stable.err
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.sql
sql/test/leaks/Tests/drop3.stable.err
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.sql
sql/test/leaks/Tests/select1.stable.err
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.sql
sql/test/leaks/Tests/select2.stable.err
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.sql
sql/test/leaks/Tests/temp1.stable.err
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.sql
sql/test/leaks/Tests/temp2.stable.err
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.sql
sql/test/leaks/Tests/temp3.stable.err
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3.stable.out.int128
sql/test/mapi/Tests/perl_int128.stable.out
sql/test/mergetables/Tests/forex.stable.out
sql/test/mergetables/Tests/mergeinit.stable.out
sql/test/pg_regress/Tests/numeric_big.stable.out
sql/test/pg_regress/Tests/numerology.stable.out
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/pg_regress/Tests/text.stable.out
sql/test/pg_regress/Tests/timestamp.stable.out
sql/test/pg_regress/Tests/without_oid.stable.out
sql/test/pg_regress/Tests/without_oid.stable.out.oid32
sql/test/quantiles/Tests/quantiles.stable.out
testing/Mtest.py.in
Branch: geo
Log Message:
Merge with default branch.
diffs (truncated from 250438 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -909,7 +909,6 @@ developer, but if you do want to test, t
--enable-gsl=yes \
--enable-instrument=no \
--enable-jdbc=no \
- --enable-jsonstore=no \
--enable-merocontrol=no \
--enable-microhttpd=no \
--enable-monetdb5=yes \
@@ -942,37 +941,32 @@ developer, but if you do want to test, t
make
%install
-rm -rf $RPM_BUILD_ROOT
-
-%makeinstall
-
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/MonetDB
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/monetdb5/dbfarm
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/monetdb
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/monetdb
-mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}
-if [ ! $RPM_BUILD_ROOT%{_prefix}/lib/perl5 -ef
$RPM_BUILD_ROOT%{perl_vendorlib} ]; then
- mv $RPM_BUILD_ROOT%{_prefix}/lib/perl5/* $RPM_BUILD_ROOT%{perl_vendorlib}
+%make_install
+
+mkdir -p %{buildroot}%{_localstatedir}/MonetDB
+mkdir -p %{buildroot}%{_localstatedir}/monetdb5/dbfarm
+mkdir -p %{buildroot}%{_localstatedir}/log/monetdb
+mkdir -p %{buildroot}%{_localstatedir}/run/monetdb
+mkdir -p %{buildroot}%{perl_vendorlib}
+if [ ! %{buildroot}%{_prefix}/lib/perl5 -ef %{buildroot}%{perl_vendorlib} ];
then
+ mv %{buildroot}%{_prefix}/lib/perl5/* %{buildroot}%{perl_vendorlib}
fi
# remove unwanted stuff
# .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/monetdb5/*.la
# internal development stuff
-rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
+rm -f %{buildroot}%{_bindir}/Maddlog
%if 0%{?fedora} >= 20
-mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL-%{version}
$RPM_BUILD_ROOT%{_datadir}/doc/MonetDB-SQL
+mv %{buildroot}%{_datadir}/doc/MonetDB-SQL-%{version}
%{buildroot}%{_datadir}/doc/MonetDB-SQL
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%clean
-rm -fr $RPM_BUILD_ROOT
-
%changelog
* Fri Jan 23 2015 Sjoerd Mullender <[email protected]> - 11.19.9-20150123
- Rebuilt.
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
@@ -2030,8 +2030,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4EB618ABA45B48A2B358D8F899B302FC"
{
- "SourcePath" = "8:lib\\monetdb5\\createdb\\41_jsonstore.sql"
- "TargetName" = "8:41_jsonstore.sql"
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\41_md5sum.sql"
+ "TargetName" = "8:41_md5sum.sql"
"Tag" = "8:"
"Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
"Condition" = "8:"
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
@@ -2030,8 +2030,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4EB618ABA45B48A2B358D8F899B302FC"
{
- "SourcePath" = "8:lib\\monetdb5\\createdb\\41_jsonstore.sql"
- "TargetName" = "8:41_jsonstore.sql"
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\41_md5sum.sql"
+ "TargetName" = "8:41_md5sum.sql"
"Tag" = "8:"
"Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
"Condition" = "8:"
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
@@ -221,9 +221,6 @@
#define HAVE_ISINF 1
#endif
-/* Define that you want to build the jsonstore library */
-/* #undef HAVE_JSONSTORE */
-
/* Define to 1 if you have the `kill' function. */
/* #undef HAVE_KILL */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -428,11 +428,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_SQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_JSONSTORE
- $(ECHO) HAVE_JSONSTORE_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_JSONSTORE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_TESTING
$(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/clients/R/Tests/dbi.stable.out b/clients/R/Tests/dbi.stable.out
--- a/clients/R/Tests/dbi.stable.out
+++ b/clients/R/Tests/dbi.stable.out
@@ -38,7 +38,7 @@ Ready.
# loading sql script: 26_sysmon.sql
# loading sql script: 39_analytics.sql
# loading sql script: 40_json.sql
-# loading sql script: 41_jsonstore.sql
+# loading sql script: 41_md5sum.sql
# loading sql script: 45_uuid.sql
# loading sql script: 75_storagemodel.sql
# loading sql script: 80_statistics.sql
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,9 +1,4 @@
exports
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT&!HAVE_JSONSTORE?MAL-signatures_all
-HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!HAVE_JSONSTORE?MAL-signatures_fits_geom
-!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!HAVE_JSONSTORE?MAL-signatures_geom
-!HAVE_FITS&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!HAVE_JSONSTORE?MAL-signatures_none
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32?SQL-dump_all
-HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS?SQL-dump_geom
-!HAVE_FITS&!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!BITS32?SQL-dump_none
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32?SQL-dump
MERCURIAL?malcheck
diff --git a/clients/Tests/MAL-signatures_all.malC
b/clients/Tests/MAL-signatures.malC
rename from clients/Tests/MAL-signatures_all.malC
rename to clients/Tests/MAL-signatures.malC
diff --git a/clients/Tests/MAL-signatures_all.stable.err
b/clients/Tests/MAL-signatures.stable.err
rename from clients/Tests/MAL-signatures_all.stable.err
rename to clients/Tests/MAL-signatures.stable.err
--- a/clients/Tests/MAL-signatures_all.stable.err
+++ b/clients/Tests/MAL-signatures.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'MAL-signatures_all` in directory 'clients` itself:
+stderr of test 'MAL-signatures` in directory 'clients` itself:
# 21:33:47 >
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures.stable.out
rename from clients/Tests/MAL-signatures_all.stable.out
rename to clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'MAL-signatures_all` in directory 'clients` itself:
+stdout of test 'MAL-signatures` in directory 'clients` itself:
# 21:33:47 >
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128
b/clients/Tests/MAL-signatures_all.stable.out.int128
deleted file mode 100644
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ /dev/null
@@ -1,52673 +0,0 @@
-stdout of test 'MAL-signatures_all` in directory 'clients` itself:
-
-
-# 21:44:50 >
-# 21:44:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33053" "--set"
"mapi_usock=/var/tmp/mtest-13793/.s.monetdb.33053" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_clients" "--set"
"mal_listing=2" "--set" "embedded_r=yes"
-# 21:44:50 >
-
-# MonetDB 5 server v11.20.0
-# This is an unreleased version
-# Serving database 'mTests_clients', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 7.734 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-
-Ready.
-
-# 15:16:50 >
-# 15:16:50 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9622" "--port=32080"
-# 15:16:50 >
-
-#?*)
-command aggr.avg(b:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_1])
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd])
-address AGGRavg23_dbl;
-comment Grouped tail average on hge, also returns count
-
-command aggr.avg(b:bat[:oid,:hge],e:bat[:oid,:any_1])
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd])
-address AGGRavg22_dbl;
-comment Grouped tail average on hge, also returns count
-
-command
aggr.avg(b:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg13_dbl;
-comment Grouped tail average on hge
-
-command aggr.avg(b:bat[:oid,:hge],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg12_dbl;
-comment Grouped tail average on hge
-
-command aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1])
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd])
-address AGGRavg23_dbl;
-comment Grouped tail average on dbl, also returns count
-
-command aggr.avg(b:bat[:oid,:dbl],e:bat[:oid,:any_1])
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd])
-address AGGRavg22_dbl;
-comment Grouped tail average on dbl, also returns count
-
-command
aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg13_dbl;
-comment Grouped tail average on dbl
-
-command aggr.avg(b:bat[:oid,:dbl],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg12_dbl;
-comment Grouped tail average on dbl
-
-command aggr.avg(b:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_1])
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd])
-address AGGRavg23_dbl;
-comment Grouped tail average on flt, also returns count
-
-command aggr.avg(b:bat[:oid,:flt],e:bat[:oid,:any_1])
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd])
-address AGGRavg22_dbl;
-comment Grouped tail average on flt, also returns count
-
-command
aggr.avg(b:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg13_dbl;
-comment Grouped tail average on flt
-
-command aggr.avg(b:bat[:oid,:flt],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg12_dbl;
-comment Grouped tail average on flt
-
-command aggr.avg(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1])
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd])
-address AGGRavg23_dbl;
-comment Grouped tail average on lng, also returns count
-
-command aggr.avg(b:bat[:oid,:lng],e:bat[:oid,:any_1])
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd])
-address AGGRavg22_dbl;
-comment Grouped tail average on lng, also returns count
-
-command
aggr.avg(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg13_dbl;
-comment Grouped tail average on lng
-
-command aggr.avg(b:bat[:oid,:lng],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg12_dbl;
-comment Grouped tail average on lng
-
-command aggr.avg(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1])
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd])
-address AGGRavg23_dbl;
-comment Grouped tail average on wrd, also returns count
-
-command aggr.avg(b:bat[:oid,:wrd],e:bat[:oid,:any_1])
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd])
-address AGGRavg22_dbl;
-comment Grouped tail average on wrd, also returns count
-
-command
aggr.avg(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg13_dbl;
-comment Grouped tail average on wrd
-
-command aggr.avg(b:bat[:oid,:wrd],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg12_dbl;
-comment Grouped tail average on wrd
-
-command aggr.avg(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1])
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd])
-address AGGRavg23_dbl;
-comment Grouped tail average on int, also returns count
-
-command aggr.avg(b:bat[:oid,:int],e:bat[:oid,:any_1])
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd])
-address AGGRavg22_dbl;
-comment Grouped tail average on int, also returns count
-
-command
aggr.avg(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg13_dbl;
-comment Grouped tail average on int
-
-command aggr.avg(b:bat[:oid,:int],e:bat[:oid,:any_1]):bat[:oid,:dbl]
-address AGGRavg12_dbl;
-comment Grouped tail average on int
-
-command aggr.avg(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1])
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd])
-address AGGRavg23_dbl;
-comment Grouped tail average on sht, also returns count
-
-command aggr.avg(b:bat[:oid,:sht],e:bat[:oid,:any_1])
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd])
-address AGGRavg22_dbl;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
