Merge branch 'master' of https://github.com/apache/incubator-trafodion into a_spj
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1558dd21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1558dd21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1558dd21 Branch: refs/heads/master Commit: 1558dd214c453d30c24de23b74506bb02a0b5696 Parents: 62b91c3 fc9651f Author: Kevin Xu <[email protected]> Authored: Mon Dec 28 14:19:39 2015 +0800 Committer: Kevin Xu <[email protected]> Committed: Mon Dec 28 14:19:39 2015 +0800 ---------------------------------------------------------------------- .../jdbc_type2/native/SQLMXDatabaseMetaData.cpp | 6 ++++-- core/conn/jdbc_type2/native/SrvrCommon.cpp | 4 ++-- core/conn/jdbc_type2/native/SrvrSmd.cpp | 7 ------- .../sql/scripts/install_hadoop_regr_test_env | 22 ++++++++++---------- core/sql/sqlcomp/CmpDescribe.cpp | 5 +++++ dcs/bin/start-dcs.sh | 2 +- dcs/bin/stop-dcs.sh | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
