Changeset: 53b64c978618 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53b64c978618 Modified Files: clients/Tests/exports.stable.out gdk/gdk_logger.c gdk/gdk_logger.h java/src/main/java/nl/cwi/monetdb/jdbc/MonetTwoStageCommit.java sql/backends/monet5/Tests/pyapi29.stable.out sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_result.c sql/include/sql_catalog.h sql/scripts/85_htm.sql sql/scripts/Makefile.ag sql/server/sql_mvc.c sql/server/sql_mvc.h sql/storage/bat/bat_logger.c sql/storage/sql_storage.h sql/storage/store.c sql/test/2-phase-commit/Tests/All sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.sql sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.sql sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.sql sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.out sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.sql sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.err sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.out sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.sql sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.err sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.out sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.sql sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.err sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.out sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.sql sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.err sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.out sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.sql sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.err sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.out sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.SQL.py sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.err sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.out sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.sql sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.err sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.out sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.sql sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.err sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.out sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.sql sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.err sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.out sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.sql sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.err sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.out sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.sql sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.err sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.out sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.sql sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.err sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.out sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.sql sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.err sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.out sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.sql sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.err sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.out sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.SQL.py sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.err sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.out sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.sql sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.err sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.out sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.sql sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.err sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.out sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.sql sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.err sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.out sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.sql sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.err sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.out sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.sql sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.err sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.out sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.sql sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.err sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.out sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.sql sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.err sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.out sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.sql sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.err sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.out sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.sql sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.err sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.out sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.sql sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.err sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.out sql/test/2-phase-commit/Tests/TwoInsertsIn1Transaction.sql sql/test/2-phase-commit/Tests/TwoInsertsIn1Transaction.stable.err sql/test/2-phase-commit/Tests/TwoInsertsIn1Transaction.stable.out sql/test/2-phase-commit/Tests/setup.sql sql/test/2-phase-commit/Tests/setup.stable.err sql/test/2-phase-commit/Tests/setup.stable.out Branch: HTM Log Message:
Add project ACK diffs (truncated from 1365 to 300 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1,3 +1,8 @@ +# Acknowledgement +# =============== +# +# The research leading to this code has been partially funded by the European +# Commission under FP7 programme project #611068. stdout of test 'exports` in directory 'clients` itself: diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c --- a/gdk/gdk_logger.c +++ b/gdk/gdk_logger.c @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ /* diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h --- a/gdk/gdk_logger.h +++ b/gdk/gdk_logger.h @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ #ifndef _LOGGER_H_ diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetTwoStageCommit.java b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetTwoStageCommit.java --- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetTwoStageCommit.java +++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetTwoStageCommit.java @@ -15,6 +15,12 @@ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI. * Copyright August 2008-2014 MonetDB B.V. * All Rights Reserved. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ package nl.cwi.monetdb.jdbc; diff --git a/sql/backends/monet5/Tests/pyapi29.stable.out b/sql/backends/monet5/Tests/pyapi29.stable.out --- a/sql/backends/monet5/Tests/pyapi29.stable.out +++ b/sql/backends/monet5/Tests/pyapi29.stable.out @@ -1,3 +1,8 @@ +# Acknowledgement +# =============== +# +# The research leading to this code has been partially funded by the European +# Commission under FP7 programme project #611068. stdout of test 'pyapi29` in directory 'sql/backends/monet5` itself: diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c --- a/sql/backends/monet5/sql.c +++ b/sql/backends/monet5/sql.c @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ /* diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h --- a/sql/backends/monet5/sql.h +++ b/sql/backends/monet5/sql.h @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ /* diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal --- a/sql/backends/monet5/sql.mal +++ b/sql/backends/monet5/sql.mal @@ -3,6 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # # Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. +# +# Acknowledgement +# =============== +# +# The research leading to this code has been partially funded by the European +# Commission under FP7 programme project #611068. module batsql; module sql; 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 @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ /* diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h --- a/sql/include/sql_catalog.h +++ b/sql/include/sql_catalog.h @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ #ifndef SQL_CATALOG_H diff --git a/sql/scripts/85_htm.sql b/sql/scripts/85_htm.sql --- a/sql/scripts/85_htm.sql +++ b/sql/scripts/85_htm.sql @@ -3,6 +3,13 @@ -- file, You can obtain one at http://mozilla.org/MPL/2.0/. -- -- Copyright 2008-2015 MonetDB B.V. +-- +-- Acknowledgement +-- =============== +-- +-- The research leading to this code has been partially funded by the European +-- Commission under FP7 programme project #611068. + CREATE PROCEDURE precommit(id bigint) EXTERNAL name sql.precommit; diff --git a/sql/scripts/Makefile.ag b/sql/scripts/Makefile.ag --- a/sql/scripts/Makefile.ag +++ b/sql/scripts/Makefile.ag @@ -3,6 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # # Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. +# +# Acknowledgement +# =============== +# +# The research leading to this code has been partially funded by the European +# Commission under FP7 programme project #611068. MT_SAFE diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c --- a/sql/server/sql_mvc.c +++ b/sql/server/sql_mvc.c @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ /* multi version catalog */ diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h --- a/sql/server/sql_mvc.h +++ b/sql/server/sql_mvc.h @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ /* multi version catalog */ diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c --- a/sql/storage/bat/bat_logger.c +++ b/sql/storage/bat/bat_logger.c @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ #include "monetdb_config.h" diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h --- a/sql/storage/sql_storage.h +++ b/sql/storage/sql_storage.h @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ #ifndef SQL_STORAGE_H diff --git a/sql/storage/store.c b/sql/storage/store.c --- a/sql/storage/store.c +++ b/sql/storage/store.c @@ -4,6 +4,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. + * + * Acknowledgement + * =============== + * + * The research leading to this code has been partially funded by the European + * Commission under FP7 programme project #611068. */ #include "monetdb_config.h" diff --git a/sql/test/2-phase-commit/Tests/All b/sql/test/2-phase-commit/Tests/All --- a/sql/test/2-phase-commit/Tests/All +++ b/sql/test/2-phase-commit/Tests/All @@ -1,3 +1,9 @@ +# Acknowledgement +# =============== +# +# The research leading to this code has been partially funded by the European +# Commission under FP7 programme project #611068. + setup MultipleConnectionsAllWithAutocommit MultipleConnections-cleanup diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.sql b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.sql --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.sql +++ b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.sql @@ -1,3 +1,9 @@ +-- Acknowledgement +-- =============== +-- +-- The research leading to this code has been partially funded by the European +-- Commission under FP7 programme project #611068. + START TRANSACTION; INSERT INTO htmtest VALUES (16, 99), (17, 99), (18, 99); SELECT * FROM htmtest; diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err +++ b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err @@ -1,3 +1,8 @@ +# Acknowledgement +# =============== +# +# The research leading to this code has been partially funded by the European +# Commission under FP7 programme project #611068. _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
