You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2015/10/02 18:16:37 UTC
[8/9] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into bug/1129
Merge branch 'master' of github.com:apache/incubator-trafodion into bug/1129
Conflicts:
core/sqf/sqenvcom.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d7f1daee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d7f1daee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d7f1daee
Branch: refs/heads/master
Commit: d7f1daee614b8e4c04bd10dd05033c46a61f2d14
Parents: a44823f 469408f
Author: Hans Zeller <ha...@esgyn.com>
Authored: Thu Oct 1 02:21:40 2015 +0000
Committer: Hans Zeller <ha...@esgyn.com>
Committed: Thu Oct 1 02:21:40 2015 +0000
----------------------------------------------------------------------
.gitignore | 1 +
Makefile | 25 ++
core/Makefile | 45 ++-
core/conn/Makefile | 6 +-
.../unixcli/package/trafodbclnx_install.sh | 5 -
core/macros.gmk | 1 +
core/rest/Makefile | 6 +-
core/rest/genvers | 22 +-
core/rest/src/saveVersion.sh | 11 +-
core/sqf/Makefile | 21 +-
core/sqf/sqenvcom.sh | 1 +
core/sqf/sql/scripts/dcscheck | 108 ++++-
core/sqf/sql/scripts/install_local_hadoop | 273 ++-----------
core/sqf/sql/scripts/install_traf_components | 401 +++++++++++++++++++
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqconfig | 24 --
core/sql/optimizer/NodeMap.cpp | 2 +-
core/sql/regress/hive/EXPECTED009 | 32 +-
core/sql/sqlcomp/DefaultConstants.h | 2 +
core/sql/sqlcomp/nadefaults.cpp | 4 +-
core/sql/ustat/hs_globals.cpp | 30 +-
core/sql/ustat/hs_globals.h | 6 +-
dcs/.gitignore | 1 +
dcs/Makefile | 52 +++
dcs/genvers | 24 ++
dcs/src/saveVersion.sh | 15 +-
env.sh | 24 ++
wms/src/saveVersion.sh | 7 +-
28 files changed, 790 insertions(+), 361 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7f1daee/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --cc core/sqf/sqenvcom.sh
index 2de3983,e0420cc..a9b2d00
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@@ -872,6 -872,8 +872,7 @@@ if [[ -n "$SQ_CLASSPATH" ]]; then SQ_
SQ_CLASSPATH=${SQ_CLASSPATH}${HBASE_TRXDIR}:\
${HBASE_TRXDIR}/${HBASE_TRX_JAR}:\
$MY_SQROOT/export/lib/trafodion-sql-${TRAFODION_VER}.jar:\
-$MY_SQROOT/export/lib/trafodion-HBaseAccess-${TRAFODION_VER}.jar:\
+ $MY_SQROOT/export/lib/jdbcT4.jar:\
$MY_SQROOT/export/lib/jdbcT2.jar
# Check whether the current shell environment changed from a previous execution of this