Merge branch 'master' of https://github.com/apache/trafodion into TRAFODION-1861
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d2b365c0 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d2b365c0 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d2b365c0 Branch: refs/heads/master Commit: d2b365c016ede7a49ff9d40b3d060499737fe4d2 Parents: 4addf76 008f4af Author: LiuMing <[email protected]> Authored: Wed May 9 12:33:52 2018 +0800 Committer: LiuMing <[email protected]> Committed: Wed May 9 12:33:52 2018 +0800 ---------------------------------------------------------------------- core/sqf/src/trafconf/tcdbsqlite.cpp | 2 -- core/sqf/src/trafconf/tctrace.cpp | 2 +- core/sql/parser/sqlparser.y | 8 ++++++++ core/sql/regress/seabase/EXPECTED002 | 20 ++++++++++---------- core/sql/sqlcomp/CmpSeabaseDDLmd.h | 4 ++-- .../java/org/trafodion/sql/HBaseClient.java | 14 -------------- core/sql/ustat/hs_cli.cpp | 1 + core/sql/ustat/hs_globals.cpp | 4 ++++ core/sql/ustat/hs_log.h | 1 + 9 files changed, 27 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
