Changeset: 1d1fb9eb2526 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d1fb9eb2526
Added Files:
sql/backends/monet5/vaults/bam/85_bam.mal
sql/backends/monet5/vaults/bam/85_bam.sql
sql/backends/monet5/vaults/bam/BAMRecipe.pdf
sql/backends/monet5/vaults/bam/Makefile.ag
sql/backends/monet5/vaults/bam/Tests/All
sql/backends/monet5/vaults/bam/Tests/bam.py
sql/backends/monet5/vaults/bam/Tests/bam_export.SQL.py
sql/backends/monet5/vaults/bam/Tests/bam_lib.reqtests
sql/backends/monet5/vaults/bam/Tests/bam_lib.sql
sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.mal
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_loader_file.SQL.py
sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_loader_files.SQL.py
sql/backends/monet5/vaults/bam/Tests/bam_loader_files.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_loader_files.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.SQL.py
sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.stable.out
sql/backends/monet5/vaults/bam/Tests/check_files.reqtests
sql/backends/monet5/vaults/bam/Tests/check_files.sql
sql/backends/monet5/vaults/bam/Tests/check_files.stable.err
sql/backends/monet5/vaults/bam/Tests/check_files.stable.out
sql/backends/monet5/vaults/bam/Tests/check_files_exact.sql
sql/backends/monet5/vaults/bam/Tests/check_files_exact.stable.err
sql/backends/monet5/vaults/bam/Tests/check_files_exact.stable.out
sql/backends/monet5/vaults/bam/Tests/coverage_usecase.reqtests
sql/backends/monet5/vaults/bam/Tests/coverage_usecase.sql
sql/backends/monet5/vaults/bam/Tests/drop_last_files.SQL.py
sql/backends/monet5/vaults/bam/Tests/drop_last_files.stable.err
sql/backends/monet5/vaults/bam/Tests/drop_last_files.stable.out
sql/backends/monet5/vaults/bam/Tests/files/file1.bam
sql/backends/monet5/vaults/bam/Tests/files/file2.sam
sql/backends/monet5/vaults/bam/Tests/files/queryname/file1.bam
sql/backends/monet5/vaults/bam/Tests/files/queryname/file2.sam
sql/backends/monet5/vaults/bam/Tests/mergetable.reqtests
sql/backends/monet5/vaults/bam/Tests/mergetable.sql
sql/backends/monet5/vaults/bam/Tests/mergetable.stable.err
sql/backends/monet5/vaults/bam/Tests/mergetable.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.1.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.1.sql
sql/backends/monet5/vaults/bam/Tests/query1.1.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.2.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.2.sql
sql/backends/monet5/vaults/bam/Tests/query1.2.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.3.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.3.sql
sql/backends/monet5/vaults/bam/Tests/query1.3.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.3.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.4.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.4.sql
sql/backends/monet5/vaults/bam/Tests/query1.4.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.4.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.5.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.5.sql
sql/backends/monet5/vaults/bam/Tests/query1.5.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.5.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.6.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.6.sql
sql/backends/monet5/vaults/bam/Tests/query2.1.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.1.sql
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.10.sql
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.11.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.11.sql
sql/backends/monet5/vaults/bam/Tests/query2.11.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.12.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.12.sql
sql/backends/monet5/vaults/bam/Tests/query2.12.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.12.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.12.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.2.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.2.sql
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.3.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.3.sql
sql/backends/monet5/vaults/bam/Tests/query2.3.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.3.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.4.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.4.sql
sql/backends/monet5/vaults/bam/Tests/query2.4.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.4.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.5.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.5.sql
sql/backends/monet5/vaults/bam/Tests/query2.5.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.5.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.5.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.6.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.6.sql
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.7.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.7.sql
sql/backends/monet5/vaults/bam/Tests/query2.7.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.7.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.8.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.8.sql
sql/backends/monet5/vaults/bam/Tests/query2.8.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.9.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.9.sql
sql/backends/monet5/vaults/bam/Tests/query2.9.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.9.stable.out
sql/backends/monet5/vaults/bam/Tests/sam_export.SQL.py
sql/backends/monet5/vaults/bam/Tests/sam_export.reqtests
sql/backends/monet5/vaults/bam/Tests/sam_export.stable.err
sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
sql/backends/monet5/vaults/bam/Tests/sql/bam_export.sql
sql/backends/monet5/vaults/bam/Tests/sql/bam_loader_file.sql
sql/backends/monet5/vaults/bam/Tests/sql/bam_loader_files.sql
sql/backends/monet5/vaults/bam/Tests/sql/bam_loader_repos.sql
sql/backends/monet5/vaults/bam/Tests/sql/sam_export.sql
sql/backends/monet5/vaults/bam/Tests/verify_load.sql
sql/backends/monet5/vaults/bam/Tests/verify_load.stable.err
sql/backends/monet5/vaults/bam/Tests/verify_load.stable.out
sql/backends/monet5/vaults/bam/bam.mal
sql/backends/monet5/vaults/bam/bam_db_interface.c
sql/backends/monet5/vaults/bam/bam_db_interface.h
sql/backends/monet5/vaults/bam/bam_export.c
sql/backends/monet5/vaults/bam/bam_export.h
sql/backends/monet5/vaults/bam/bam_globals.c
sql/backends/monet5/vaults/bam/bam_globals.h
sql/backends/monet5/vaults/bam/bam_lib.c
sql/backends/monet5/vaults/bam/bam_lib.h
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/vaults/bam/bam_loader.h
sql/backends/monet5/vaults/bam/bam_wrapper.c
sql/backends/monet5/vaults/bam/bam_wrapper.h
sql/backends/monet5/vaults/bam/default_schema.dia
sql/backends/monet5/vaults/bam/default_schema.png
sql/backends/monet5/vaults/bam/metadata.dia
sql/backends/monet5/vaults/bam/metadata.png
sql/backends/monet5/vaults/bam/mykstring.h
sql/backends/monet5/vaults/bam/paired_schema.dia
sql/backends/monet5/vaults/bam/paired_schema.png
sql/backends/monet5/vaults/fits/72_fits.mal
sql/backends/monet5/vaults/fits/72_fits.sql
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/fits/fits.h
sql/backends/monet5/vaults/fits/fits.mal
sql/backends/monet5/vaults/lidar/75_lidar.mal
sql/backends/monet5/vaults/lidar/75_lidar.sql
sql/backends/monet5/vaults/lidar/Makefile.ag
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/lidar/lidar.h
sql/backends/monet5/vaults/lidar/lidar.mal
sql/backends/monet5/vaults/netcdf/74_netcdf.mal
sql/backends/monet5/vaults/netcdf/74_netcdf.sql
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/vaults/netcdf/netcdf.mal
sql/backends/monet5/vaults/netcdf/netcdf_vault.h
sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.sql
sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.stable.err
sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.stable.out
sql/test/SQLite_regress/sqllogictest/Original_source_URLs.txt
sql/test/SQLite_regress/sqllogictest/Tests/All
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select5.test.sql
sql/test/SQLite_regress/sqllogictest/Tests/select5.test.stable.err
sql/test/SQLite_regress/sqllogictest/Tests/select5.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select5.test.timeout
sql/test/SQLite_regress/sqllogictest/select1.test
sql/test/SQLite_regress/sqllogictest/select2.test
sql/test/SQLite_regress/sqllogictest/select3.test
sql/test/SQLite_regress/sqllogictest/select4.test
sql/test/SQLite_regress/sqllogictest/select5.test
Removed Files:
sql/backends/monet5/bam/85_bam.mal
sql/backends/monet5/bam/85_bam.sql
sql/backends/monet5/bam/BAMRecipe.pdf
sql/backends/monet5/bam/Makefile.ag
sql/backends/monet5/bam/Tests/All
sql/backends/monet5/bam/Tests/bam.py
sql/backends/monet5/bam/Tests/bam_export.SQL.py
sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py
sql/backends/monet5/bam/Tests/bam_loader_file.stable.err
sql/backends/monet5/bam/Tests/bam_loader_file.stable.out
sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py
sql/backends/monet5/bam/Tests/bam_loader_files.stable.err
sql/backends/monet5/bam/Tests/bam_loader_files.stable.out
sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py
sql/backends/monet5/bam/Tests/bam_loader_repos.stable.err
sql/backends/monet5/bam/Tests/bam_loader_repos.stable.out
sql/backends/monet5/bam/Tests/check_files.reqtests
sql/backends/monet5/bam/Tests/check_files.sql
sql/backends/monet5/bam/Tests/check_files.stable.err
sql/backends/monet5/bam/Tests/check_files.stable.out
sql/backends/monet5/bam/Tests/check_files_exact.sql
sql/backends/monet5/bam/Tests/check_files_exact.stable.err
sql/backends/monet5/bam/Tests/check_files_exact.stable.out
sql/backends/monet5/bam/Tests/drop_last_files.SQL.py
sql/backends/monet5/bam/Tests/drop_last_files.stable.err
sql/backends/monet5/bam/Tests/drop_last_files.stable.out
sql/backends/monet5/bam/Tests/files/file1.bam
sql/backends/monet5/bam/Tests/files/file2.sam
sql/backends/monet5/bam/Tests/files/queryname/file1.bam
sql/backends/monet5/bam/Tests/files/queryname/file2.sam
sql/backends/monet5/bam/Tests/mergetable.SQL.py
sql/backends/monet5/bam/Tests/mergetable.stable.err
sql/backends/monet5/bam/Tests/mergetable.stable.out
sql/backends/monet5/bam/Tests/query1.1.reqtests
sql/backends/monet5/bam/Tests/query1.1.sql
sql/backends/monet5/bam/Tests/query1.1.stable.err
sql/backends/monet5/bam/Tests/query1.1.stable.out
sql/backends/monet5/bam/Tests/query1.2.reqtests
sql/backends/monet5/bam/Tests/query1.2.sql
sql/backends/monet5/bam/Tests/query1.2.stable.err
sql/backends/monet5/bam/Tests/query1.2.stable.out
sql/backends/monet5/bam/Tests/query1.3.reqtests
sql/backends/monet5/bam/Tests/query1.3.sql
sql/backends/monet5/bam/Tests/query1.3.stable.err
sql/backends/monet5/bam/Tests/query1.3.stable.out
sql/backends/monet5/bam/Tests/query1.4.reqtests
sql/backends/monet5/bam/Tests/query1.4.sql
sql/backends/monet5/bam/Tests/query1.4.stable.err
sql/backends/monet5/bam/Tests/query1.4.stable.out
sql/backends/monet5/bam/Tests/query1.5.reqtests
sql/backends/monet5/bam/Tests/query1.5.sql
sql/backends/monet5/bam/Tests/query1.5.stable.err
sql/backends/monet5/bam/Tests/query1.5.stable.out
sql/backends/monet5/bam/Tests/query1.6.reqtests
sql/backends/monet5/bam/Tests/query1.6.sql
sql/backends/monet5/bam/Tests/query2.1.reqtests
sql/backends/monet5/bam/Tests/query2.1.sql
sql/backends/monet5/bam/Tests/query2.1.stable.err
sql/backends/monet5/bam/Tests/query2.1.stable.out
sql/backends/monet5/bam/Tests/query2.10.reqtests
sql/backends/monet5/bam/Tests/query2.10.sql
sql/backends/monet5/bam/Tests/query2.10.stable.err
sql/backends/monet5/bam/Tests/query2.10.stable.out
sql/backends/monet5/bam/Tests/query2.11.reqtests
sql/backends/monet5/bam/Tests/query2.11.sql
sql/backends/monet5/bam/Tests/query2.11.stable.err
sql/backends/monet5/bam/Tests/query2.11.stable.out
sql/backends/monet5/bam/Tests/query2.12.reqtests
sql/backends/monet5/bam/Tests/query2.12.sql
sql/backends/monet5/bam/Tests/query2.12.stable.err
sql/backends/monet5/bam/Tests/query2.12.stable.out
sql/backends/monet5/bam/Tests/query2.12.stable.out.int128
sql/backends/monet5/bam/Tests/query2.2.reqtests
sql/backends/monet5/bam/Tests/query2.2.sql
sql/backends/monet5/bam/Tests/query2.2.stable.err
sql/backends/monet5/bam/Tests/query2.2.stable.out
sql/backends/monet5/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/bam/Tests/query2.3.reqtests
sql/backends/monet5/bam/Tests/query2.3.sql
sql/backends/monet5/bam/Tests/query2.3.stable.err
sql/backends/monet5/bam/Tests/query2.3.stable.out
sql/backends/monet5/bam/Tests/query2.4.reqtests
sql/backends/monet5/bam/Tests/query2.4.sql
sql/backends/monet5/bam/Tests/query2.4.stable.err
sql/backends/monet5/bam/Tests/query2.4.stable.out
sql/backends/monet5/bam/Tests/query2.5.reqtests
sql/backends/monet5/bam/Tests/query2.5.sql
sql/backends/monet5/bam/Tests/query2.5.stable.err
sql/backends/monet5/bam/Tests/query2.5.stable.out
sql/backends/monet5/bam/Tests/query2.5.stable.out.int128
sql/backends/monet5/bam/Tests/query2.6.reqtests
sql/backends/monet5/bam/Tests/query2.6.sql
sql/backends/monet5/bam/Tests/query2.6.stable.err
sql/backends/monet5/bam/Tests/query2.6.stable.out
sql/backends/monet5/bam/Tests/query2.7.reqtests
sql/backends/monet5/bam/Tests/query2.7.sql
sql/backends/monet5/bam/Tests/query2.7.stable.err
sql/backends/monet5/bam/Tests/query2.7.stable.out
sql/backends/monet5/bam/Tests/query2.8.reqtests
sql/backends/monet5/bam/Tests/query2.8.sql
sql/backends/monet5/bam/Tests/query2.8.stable.err
sql/backends/monet5/bam/Tests/query2.8.stable.out
sql/backends/monet5/bam/Tests/query2.9.reqtests
sql/backends/monet5/bam/Tests/query2.9.sql
sql/backends/monet5/bam/Tests/query2.9.stable.err
sql/backends/monet5/bam/Tests/query2.9.stable.out
sql/backends/monet5/bam/Tests/sam_export.SQL.py
sql/backends/monet5/bam/Tests/sam_export.reqtests
sql/backends/monet5/bam/Tests/sam_export.stable.err
sql/backends/monet5/bam/Tests/sam_export.stable.out
sql/backends/monet5/bam/Tests/sql/bam_export.sql
sql/backends/monet5/bam/Tests/sql/bam_loader_file.sql
sql/backends/monet5/bam/Tests/sql/bam_loader_files.sql
sql/backends/monet5/bam/Tests/sql/bam_loader_repos.sql
sql/backends/monet5/bam/Tests/sql/drop_last_files.sql
sql/backends/monet5/bam/Tests/sql/mergetable.sql
sql/backends/monet5/bam/Tests/sql/sam_export.sql
sql/backends/monet5/bam/Tests/verify_load.sql
sql/backends/monet5/bam/Tests/verify_load.stable.err
sql/backends/monet5/bam/Tests/verify_load.stable.out
sql/backends/monet5/bam/bam.mal
sql/backends/monet5/bam/bam_db_interface.c
sql/backends/monet5/bam/bam_db_interface.h
sql/backends/monet5/bam/bam_export.c
sql/backends/monet5/bam/bam_export.h
sql/backends/monet5/bam/bam_globals.c
sql/backends/monet5/bam/bam_globals.h
sql/backends/monet5/bam/bam_lib.c
sql/backends/monet5/bam/bam_lib.h
sql/backends/monet5/bam/bam_loader.c
sql/backends/monet5/bam/bam_loader.h
sql/backends/monet5/bam/bam_wrapper.c
sql/backends/monet5/bam/bam_wrapper.h
sql/backends/monet5/bam/default_schema.dia
sql/backends/monet5/bam/default_schema.png
sql/backends/monet5/bam/metadata.dia
sql/backends/monet5/bam/metadata.png
sql/backends/monet5/bam/mykstring.h
sql/backends/monet5/bam/paired_schema.dia
sql/backends/monet5/bam/paired_schema.png
sql/backends/monet5/vaults/72_fits.mal
sql/backends/monet5/vaults/72_fits.sql
sql/backends/monet5/vaults/74_netcdf.mal
sql/backends/monet5/vaults/74_netcdf.sql
sql/backends/monet5/vaults/75_lidar.mal
sql/backends/monet5/vaults/75_lidar.sql
sql/backends/monet5/vaults/fits.c
sql/backends/monet5/vaults/fits.h
sql/backends/monet5/vaults/fits.mal
sql/backends/monet5/vaults/lidar.c
sql/backends/monet5/vaults/lidar.h
sql/backends/monet5/vaults/lidar.mal
sql/backends/monet5/vaults/netcdf.c
sql/backends/monet5/vaults/netcdf.mal
sql/backends/monet5/vaults/netcdf_vault.h
Modified Files:
buildtools/autogen/autogen/msc.py
clients/Tests/MAL-signatures.malC
clients/Tests/SQL-dump.sql
clients/Tests/SQL-dump.stable.out
clients/Tests/exports.stable.out
clients/ruby/Makefile.ag
configure.ag
monetdb5/modules/mal/Tests/remote07.malC
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql_result.c
sql/backends/monet5/vaults/Makefile.ag
sql/benchmarks/tpch/c.sql-primary
sql/benchmarks/tpch/c.sql-primary-foreign
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/41_md5sum.sql
sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/msqldump_generates_incorrect_syntax_ON_UPDATE_null.Bug-3839.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mergetables/Tests/forex.stable.err
sql/test/mergetables/Tests/forex.stable.out
testing/Mtest.py.in
Branch: leftmart
Log Message:
Merge with default branch.
diffs (truncated from 1275961 to 300 lines):
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -969,7 +969,6 @@ def msc_gem(fd, var, gem, msc):
if 'DIR' in gem:
rd = gem['DIR'][0]
rd = msc_translate_dir(rd, msc)
- rd = '$(prefix)\\' + rd
fd.write('!IF defined(HAVE_RUBYGEM)\n')
for f in gem['FILES']:
msc['SCRIPTS'].append(f[:-4])
diff --git a/clients/ruby/Makefile.ag b/clients/ruby/Makefile.ag
--- a/clients/ruby/Makefile.ag
+++ b/clients/ruby/Makefile.ag
@@ -6,7 +6,7 @@
gem_monetdb = {
FILES = ruby-monetdb-sql-0.2.gemspec
- DIR = $(RUBY_DIR)
+ DIR = $(prefix)/$(RUBY_DIR)
}
EXTRA_DIST = Changelog TODO ruby-monetdb-sql-0.2.gemspec
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1454,12 +1454,14 @@ case "$have_rubygem_dir" in
esac
case "$RUBY_DIR" in
${prefix}/*)
- RUBY_DIR="\${prefix}`echo "$RUBY_DIR" | sed "s|^$prefix||"`";;
-/*) RUBY_DIR="\${prefix}$RUBY_DIR";;
-*)
- RUBY_DIR="\${prefix}/$RUBY_DIR";;
+ RUBY_DIR="`echo "$RUBY_DIR" | sed "s|^$prefix/||"`";;
+/*) RUBY_DIR="${RUBY_DIR#/}";;
esac
AC_SUBST(RUBY_DIR)
+QRUBY_DIR="$RUBY_DIR"
+XRUBY_DIR="`$translatepath "$QRUBY_DIR"`"
+QXRUBY_DIR="`echo "$XRUBY_DIR" | sed 's/\\\\/\\\\\\\\/g'`"
+AC_SUBST(QXRUBY_DIR)
RUBYGEM=gem
org_have_rubygem=auto
@@ -2387,19 +2389,43 @@ if test "x$have_samtools" != xno; then
LDFLAGS="$LDFLAGS $SAMTOOLS_LIBS"
AC_CHECK_HEADER(samtools/bam.h,
- [ why_have_samtools= ],
- [ why_have_samtools="samtools/bam.h header not found" ])
+ [ why_have_samtools=; AC_DEFINE([HAVE_SAMTOOLS_BAM_H], 1,
[Define to 1 if you have the <samtools/bam.h> header file.]) ],
+ [ why_have_samtools="bam.h header not found" ])
+ if test -n "$why_have_samtools"; then
+ AC_CHECK_HEADER(bam/bam.h,
+ [ why_have_samtools=; AC_DEFINE([HAVE_BAM_BAM_H], 1,
[Define to 1 if you have the <samtools/bam.h> header file.]) ],
+ [ why_have_samtools="Neither bam/bam.h or bam/bam.h
header not found" ])
+ fi
+
+ if test -z "$why_have_samtools"; then
+ AC_CHECK_HEADER(samtools/sam.h,
+ [ why_have_samtools=; AC_DEFINE([HAVE_SAMTOOLS_SAM_H],
1, [Define to 1 if you have the <samtools/sam.h> header file.]) ],
+ [ why_have_samtools="sam.h header not found" ])
+ fi
+ if test -n "$why_have_samtools"; then
+ AC_CHECK_HEADER(bam/sam.h,
+ [ why_have_samtools=; AC_DEFINE([HAVE_BAM_SAM_H], 1,
[Define to 1 if you have the <bam/sam.h> header file.]) ],
+ [ why_have_samtools="Neither samtools/sam.h or
bam/sam.h header not found" ])
+ fi
+
if test -z "$why_have_samtools"; then
AC_CHECK_HEADER(samtools/bgzf.h,
- [ why_have_samtools= ],
- [ why_have_samtools="samtools/bgzf.h header not found"
])
+ [ why_have_samtools=; AC_DEFINE([HAVE_SAMTOOLS_BGZF_H],
1, [Define to 1 if you have the <samtools/bgzf.h> header file.]) ],
+ [ why_have_samtools="bgzf.h header not found" ])
fi
+ if test -n "$why_have_samtools"; then
+ AC_CHECK_HEADER(bam/bgzf.h,
+ [ why_have_samtools=; AC_DEFINE([HAVE_BAM_BGZF_H], 1,
[Define to 1 if you have the <bam/bgzf.h> header file.]) ],
+ [ why_have_samtools="Neither samtool/bgzf.h nor
bam/bgzf.h header not found" ])
+ fi
+
if test -z "$why_have_samtools"; then
AC_CHECK_LIB(bam, bam_header_read,
- AC_DEFINE(HAVE_SAMTOOLS, 1, [Define if you have the
samtools (providing the bam library)]),
+ AC_DEFINE(HAVE_SAMTOOLS, 1, [Define if you have the
samtools version 0.1.x (providing the bam library)]),
[ why_have_samtools="bam library not found" ],
[-lm -lpthread -lz])
fi
+
if test -n "$why_have_samtools"; then
if test "x$have_samtools" != xauto; then
AC_MSG_ERROR([$why_have_samtools])
@@ -2412,7 +2438,7 @@ if test "x$have_samtools" != xno; then
if test "x$have_samtools" = "xyes" -o "x$have_samtools" = "xauto"; then
SAMTOOLS_CFLAGS=
SAMTOOLS_LIBS="-lbam"
- AC_CHECK_HEADERS([samtools/kstring.h])
+ AC_CHECK_HEADERS([samtools/kstring.h bam/kstring.h])
fi
fi
AC_SUBST(SAMTOOLS_CFLAGS, $SAMTOOLS_CFLAGS)
@@ -2488,6 +2514,7 @@ esac
AC_SUBST(GEOS_INCS)
AC_SUBST(GEOS_LIBS)
+# fits, only used by sql
org_have_cfitsio=no
have_cfitsio=$org_have_cfitsio
if test "x$enable_fits" != xno; then
@@ -2499,6 +2526,7 @@ if test "x$enable_fits" != xno; then
fi
AM_CONDITIONAL(HAVE_FITS, test x"$have_cfitsio" != xno)
+# netcdf, only used by sql
org_have_netcdf=no
have_netcdf=$org_have_netcdf
if test "x$enable_netcdf" != xno; then
@@ -3380,21 +3408,12 @@ for comp in \
'sql ' \
'geom ' \
'console ' \
- 'gsl ' \
- 'fits ' \
- 'netcdf ' \
- 'lidar ' \
'microhttpd ' \
'rintegration' \
'odbc ' \
'jdbc ' \
'control ' \
'testing ' \
- 'developer ' \
- 'strict ' \
- 'debug ' \
- 'assert ' \
- 'optimize ' \
; do
eval "dft=\$dft_$comp"
eval "enable=\$enable_$comp"
@@ -3412,6 +3431,7 @@ for comp in \
'atomic_ops ' \
'bz2 ' \
'curl ' \
+ 'fits ' \
'getaddrinfo ' \
'gsl ' \
'java ' \
@@ -3419,6 +3439,8 @@ for comp in \
'java_jdbc ' \
'liblas ' \
'libxml2 ' \
+ 'lidar ' \
+ 'netcdf ' \
'openssl ' \
'pcre ' \
'perl ' \
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -4,7 +4,7 @@
#
# Copyright 2008-2015 MonetDB B.V.
-SUBDIRS = NOT_WIN32?vaults UDF HAVE_SAMTOOLS?bam LSST HAVE_GSL?gsl generator
+SUBDIRS = NOT_WIN32?vaults UDF LSST HAVE_GSL?gsl generator
INCLUDES = ../../include ../../common ../../storage ../../server \
../../../monetdb5/modules/atoms \
diff --git a/sql/backends/monet5/bam/Tests/mergetable.SQL.py
b/sql/backends/monet5/bam/Tests/mergetable.SQL.py
deleted file mode 100644
--- a/sql/backends/monet5/bam/Tests/mergetable.SQL.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import bam
-
-bam.exec_sql_file("mergetable.sql", {'PWD': bam.SRCDIR})
diff --git a/sql/backends/monet5/bam/Tests/sql/drop_last_files.sql
b/sql/backends/monet5/bam/Tests/sql/drop_last_files.sql
deleted file mode 100644
--- a/sql/backends/monet5/bam/Tests/sql/drop_last_files.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CALL bam.bam_drop_file(5, DBSCHEMA_5);
-CALL bam.bam_drop_file(6, DBSCHEMA_6);
-CALL bam.bam_drop_file(7, DBSCHEMA_7);
-CALL bam.bam_drop_file(8, DBSCHEMA_8);
-CALL bam.bam_drop_file(9, DBSCHEMA_9);
-CALL bam.bam_drop_file(10, DBSCHEMA_10);
-CALL bam.bam_drop_file(11, DBSCHEMA_11);
-CALL bam.bam_drop_file(12, DBSCHEMA_12);
-
diff --git a/sql/backends/monet5/bam/Tests/sql/mergetable.sql
b/sql/backends/monet5/bam/Tests/sql/mergetable.sql
deleted file mode 100644
--- a/sql/backends/monet5/bam/Tests/sql/mergetable.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-SET SCHEMA bam;
-
-# Load files
-CALL bam_loader_repos('PWD/files', 0, 4);
-
-# Add a merge table over these files
-CREATE MERGE TABLE alignments (
- "virtual_offset" BIGINT NOT NULL,
- "qname" STRING NOT NULL,
- "flag" SMALLINT NOT NULL,
- "rname" STRING NOT NULL,
- "pos" INT NOT NULL,
- "mapq" SMALLINT NOT NULL,
- "cigar" STRING NOT NULL,
- "rnext" STRING NOT NULL,
- "pnext" INT NOT NULL,
- "tlen" INT NOT NULL,
- "seq" STRING NOT NULL,
- "qual" STRING NOT NULL,
- CONSTRAINT "alignments_pkey_virtual_offset" PRIMARY KEY
("virtual_offset")
-);
-
-SELECT COUNT(*) FROM alignments;
-
-ALTER TABLE alignments ADD TABLE alignments_1;
-
-SELECT COUNT(*) FROM alignments;
-
-ALTER TABLE alignments ADD TABLE alignments_2;
-
-SELECT COUNT(*) FROM alignments;
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -639,7 +639,7 @@ static void *
if (type == TYPE_str) {
sql_column *col = (sql_column *) c->extra;
- int len;
+ int len, slen;
for (e = s; *e; e++) ;
len = (int) (e - s + 1); /* 64bit: should check for
overflow */
@@ -665,7 +665,9 @@ static void *
/* or shouldn't len rather be ssize_t, here? */
return NULL;
}
- if (col->type.digits > 0 && len > 0 && len > (int)
col->type.digits) {
+ s = c->data;
+ STRLength(&slen, (const str *) &s);
+ if (col->type.digits > 0 && len > 0 && slen > (int)
col->type.digits) {
len = STRwidth(c->data);
if (len > (int) col->type.digits)
return NULL;
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -4,6 +4,8 @@
#
# Copyright 2008-2015 MonetDB B.V.
+SUBDIRS = HAVE_SAMTOOLS?bam HAVE_FITS?fits HAVE_LIDAR?lidar HAVE_NETCDF?netcdf
+
INCLUDES = ../../../include \
../../../common \
../../../storage \
@@ -19,8 +21,7 @@ INCLUDES = ../../../include \
../../../../common/stream \
../../../../common/utils \
../../../../gdk \
- $(READLINE_INCS) $(cfitsio_CFLAGS) $(curl_CFLAGS) $(netcdf_CFLAGS) \
- $(LIBLAS_INCS)
+ $(READLINE_INCS)
lib__vault = {
MODULE
@@ -48,98 +49,5 @@ headers_autoload = {
SOURCES = 70_vault.mal
}
-lib__fits = {
- MODULE
- COND = HAVE_FITS
- DIR = libdir/monetdb5
- SOURCES = fits.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- $(cfitsio_LIBS)
-}
-
-headers_fitsmal = {
- COND = HAVE_FITS
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = fits.mal
-}
-
-headers_fitssql = {
- COND = HAVE_FITS
- HEADERS = sql
- DIR = libdir/monetdb5/createdb
- SOURCES = 72_fits.sql
-}
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
