Merge remote branch 'origin/pr/406/head' into merge_406
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7b04f91e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7b04f91e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7b04f91e Branch: refs/heads/master Commit: 7b04f91e6b4ddb92ac4feeaf44a3ac08b1b90f8c Parents: f918a26 87eb034 Author: Sandhya Sundaresan <[email protected]> Authored: Wed Mar 30 16:43:47 2016 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Wed Mar 30 16:43:47 2016 +0000 ---------------------------------------------------------------------- core/sqf/src/seabed/src/fs.cpp | 3 +- core/sql/executor/ex_control.cpp | 6 + core/sql/regress/core/EXPECTEDRTS | 1436 +++++++++++++++++--------------- core/sql/regress/core/FILTERRTS | 2 + core/sql/regress/core/TESTRTS | 24 +- core/sql/sqlcomp/nadefaults.cpp | 2 +- 6 files changed, 804 insertions(+), 669 deletions(-) ----------------------------------------------------------------------
