Merge remote branch 'origin/pr/469/head' into merge_469
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/bc1b2e12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bc1b2e12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bc1b2e12 Branch: refs/heads/master Commit: bc1b2e1203ad634fb1854659093edecdcaaf8453 Parents: 1407692 ac317ac Author: Sandhya Sundaresan <[email protected]> Authored: Tue May 10 04:29:34 2016 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Tue May 10 04:29:34 2016 +0000 ---------------------------------------------------------------------- core/sql/bin/SqlciErrors.txt | 2 + core/sql/regress/executor/EXPECTED130 | 117 +++++++++++++++++++---------- core/sql/regress/executor/TEST130 | 51 ++++++------- core/sql/ustat/hs_const.h | 1 + core/sql/ustat/hs_la.cpp | 13 ++++ core/sql/ustat/hs_parser.cpp | 5 +- 6 files changed, 119 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
