[6/8] incubator-trafodion git commit: Merge remote branch 'origin/master' into ansharma_simcheck_br

[ansharma]

Merge remote branch 'origin/master' into ansharma_simcheck_br


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a164c4b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a164c4b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a164c4b7

Branch: refs/heads/master
Commit: a164c4b727a8f8314130e75cc30c5022aab776e4
Parents: 3d41ee0 5cd718a
Author: Anoop Sharma 
Authored: Thu Oct 6 20:39:19 2016 +
Committer: Anoop Sharma 
Committed: Thu Oct 6 20:39:19 2016 +

--
 core/conn/jdbc_type2/native/SQLMXDriver.cpp | 13 --
 core/sqf/commonLogger/CommonLogger.cpp  |  5 +++-
 core/sqf/commonLogger/CommonLogger.h|  2 ++
 core/sql/cli/CliExtern.cpp  | 15 +++-
 core/sql/cli/ExSqlComp.cpp  |  2 +-
 core/sql/common/Ipc.cpp | 22 -
 core/sql/common/Ipc.h   |  2 +-
 core/sql/executor/ex_frag_rt.cpp| 30 +++-
 core/sql/exp/exp_conv.cpp   |  2 +-
 core/sql/qmscommon/QRLogger.cpp |  8 ++-
 core/sql/sqlmxevents/logmxevent_traf.cpp|  8 +++
 11 files changed, 53 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a164c4b7/core/sql/cli/CliExtern.cpp
--

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a164c4b7/core/sql/cli/ExSqlComp.cpp
--

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a164c4b7/core/sql/executor/ex_frag_rt.cpp
--

[6/8] incubator-trafodion git commit: Merge remote branch 'origin/master'

[sandhya]

Merge remote branch 'origin/master'

Conflicts:
core/sql/regress/executor/EXPECTED130


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/db3ebf5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/db3ebf5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/db3ebf5d

Branch: refs/heads/master
Commit: db3ebf5d70156aa2d987656dc7231b0ebf9904d3
Parents: 5a3f202 7862d94
Author: Sandhya Sundaresan 
Authored: Fri May 27 06:45:37 2016 +
Committer: Sandhya Sundaresan 
Committed: Fri May 27 06:45:37 2016 +

--
 .gitattributes  |6 -
 .gitignore  |1 +
 .rat-excludes   |2 +-
 core/Makefile   |2 +-
 core/conn/Makefile  |5 +-
 core/conn/jdbcT4/Makefile   |1 +
 .../jdbcT4/src/main/java/T4Messages.properties  |6 +-
 .../java/org/trafodion/jdbc/t4/Address.java |2 +-
 .../jdbc/t4/HPT4ConnectionPoolDataSource.java   |  346 
 .../t4/HPT4ConnectionPoolDataSourceFactory.java |   68 -
 .../org/trafodion/jdbc/t4/HPT4DataSource.java   |  366 
 .../jdbc/t4/HPT4DataSourceFactory.java  |   62 -
 .../java/org/trafodion/jdbc/t4/HPT4Desc.java|  542 --
 .../org/trafodion/jdbc/t4/HPT4Exception.java|   38 -
 .../java/org/trafodion/jdbc/t4/HPT4Handle.java  |   84 -
 .../org/trafodion/jdbc/t4/HPT4Messages.java |  324 
 .../jdbc/t4/HPT4ParameterMetaData.java  |  243 ---
 .../trafodion/jdbc/t4/HPT4PooledConnection.java |  238 ---
 .../jdbc/t4/HPT4PooledConnectionManager.java|  385 
 .../jdbc/t4/HPT4ResultSetMetaData.java  |  309 ---
 .../jdbc/t4/InitializeDialogueReply.java|6 +-
 .../java/org/trafodion/jdbc/t4/InputOutput.java |   50 +-
 .../trafodion/jdbc/t4/InterfaceConnection.java  |   52 +-
 .../trafodion/jdbc/t4/InterfaceResultSet.java   |   34 +-
 .../trafodion/jdbc/t4/InterfaceStatement.java   |  148 +-
 .../java/org/trafodion/jdbc/t4/NCSAddress.java  |   22 +-
 .../jdbc/t4/PreparedStatementManager.java   |2 +-
 .../java/org/trafodion/jdbc/t4/T4Address.java   |   24 +-
 .../org/trafodion/jdbc/t4/T4Connection.java |   36 +-
 .../org/trafodion/jdbc/t4/T4DSProperties.java   |6 +-
 .../trafodion/jdbc/t4/T4DatabaseMetaData.java   |  132 +-
 .../java/org/trafodion/jdbc/t4/T4Driver.java|   14 +-
 .../org/trafodion/jdbc/t4/T4Properties.java |   20 +-
 .../java/org/trafodion/jdbc/t4/T4ResultSet.java |   12 +-
 .../java/org/trafodion/jdbc/t4/T4Statement.java |   20 +-
 .../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java|2 +-
 .../org/trafodion/jdbc/t4/T4_Dcs_Connect.java   |   10 +-
 .../jdbc/t4/TrafT4CallableStatement.java|   58 +-
 .../org/trafodion/jdbc/t4/TrafT4Connection.java |  108 +-
 .../jdbc/t4/TrafT4ConnectionPoolDataSource.java |  346 
 .../TrafT4ConnectionPoolDataSourceFactory.java  |   68 +
 .../org/trafodion/jdbc/t4/TrafT4DataSource.java |  366 
 .../jdbc/t4/TrafT4DataSourceFactory.java|   62 +
 .../java/org/trafodion/jdbc/t4/TrafT4Desc.java  |  542 ++
 .../org/trafodion/jdbc/t4/TrafT4Exception.java  |   38 +
 .../org/trafodion/jdbc/t4/TrafT4Handle.java |   84 +
 .../org/trafodion/jdbc/t4/TrafT4Messages.java   |  324 
 .../jdbc/t4/TrafT4ParameterMetaData.java|  243 +++
 .../jdbc/t4/TrafT4PooledConnection.java |  238 +++
 .../jdbc/t4/TrafT4PooledConnectionManager.java  |  385 
 .../jdbc/t4/TrafT4PreparedStatement.java|  118 +-
 .../org/trafodion/jdbc/t4/TrafT4ResultSet.java  |  296 +--
 .../jdbc/t4/TrafT4ResultSetMetaData.java|  309 +++
 .../org/trafodion/jdbc/t4/TrafT4Statement.java  |   70 +-
 .../java/org/trafodion/jdbc/t4/Utility.java |   24 +-
 .../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java |   16 +-
 .../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java |8 +-
 .../jdbc/t4/odbc_SQLSvc_Close_exc_.java |8 +-
 .../t4/odbc_SQLSvc_EndTransaction_exc_.java |8 +-
 .../jdbc/t4/odbc_SQLSvc_Execute_exc_.java   |   10 +-
 .../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java |   10 +-
 .../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java |6 +-
 .../t4/odbc_SQLSvc_InitializeDialogue_exc_.java |6 +-
 .../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java   |   10 +-
 .../odbc_SQLSvc_SetConnectionOption_exc_.java   |   12 +-
 .../t4/odbc_SQLSvc_TerminateDialogue_exc_.java  |8 +-
 .../java/org/trafodion/jdbc/t4/RunAllTests.java |2 +
 core/conn/jdbc_type2/native/SrvrCommon.cpp  |4 +-
 core/conn/odb/build.bat |   56 +
 core/conn/odb/odb/odb.vcxproj   |2 +
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |   39 +-