Merge remote branch 'origin/pr/936/head' into merge_936
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/81c24799 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/81c24799 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/81c24799 Branch: refs/heads/master Commit: 81c247996a25d99a6b210fc6ae1efeb93956546e Parents: 3243730 a319486 Author: Sandhya Sundaresan <sand...@apache.org> Authored: Wed Feb 1 02:57:24 2017 +0000 Committer: Sandhya Sundaresan <sand...@apache.org> Committed: Wed Feb 1 02:57:24 2017 +0000 ---------------------------------------------------------------------- .../transactional/TrxTransactionState.java.tmpl | 13 ++--- core/sql/comexe/ComTdbSort.h | 2 +- core/sql/generator/GenRelMisc.cpp | 14 +++++- core/sql/regress/executor/EXPECTED107 | 52 ++++++++++++++++++++ core/sql/regress/executor/TEST107 | 27 ++++++++++ core/sql/sqlcomp/DefaultConstants.h | 2 +- core/sql/sqlcomp/nadefaults.cpp | 2 +- 7 files changed, 102 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/81c24799/core/sql/sqlcomp/DefaultConstants.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/81c24799/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------
