Clone
 

steve varnau <steve.varnau@hp.com> in Trafodion

Final move into core sub-tree for restructured repo

    • -0
    • +1602
    /core/sql/regress/core/EXPECTED162
    • -0
    • +79
    /core/sql/regress/core/TEST162
    • -1602
    • +0
    /sql/regress/core/EXPECTED162
Merge remote branch 'core/master'

    • -1
    • +3
    /core/conn/odbc/src/odbc/Common/QSData.cpp
    • -1
    • +3
    /core/conn/odbc/src/odbc/Common/QSData.h
    • -1
    • +1
    /core/sql/regress/tools/runregr_core.ksh
Merge remote branch 'core/master'

    • -2
    • +4
    /core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp
  1. … 94 more files in changeset.
Merge remote branch 'install/master'

Merge remote branch 'win-odbc64/master'

    • -0
    • +17
    /win-odbc64/sql/common/multi-byte.h
Merge remote branch 'core/master'

    • -139
    • +181
    /core/conn/jdbc_type2/native/CSrvrStmt.h
    • -258
    • +459
    /core/conn/jdbc_type2/native/CoreCommon.h
    • -0
    • +66
    /core/conn/jdbc_type2/native/PubInterface.h
    • -0
    • +291
    /core/conn/jdbc_type2/native/PubQueryStats.h
    • -0
    • +57
    /core/conn/jdbc_type2/native/ResStatistics.cpp
    • -0
    • +87
    /core/conn/jdbc_type2/native/ResStatistics.h
    • -0
    • +489
    /core/conn/jdbc_type2/native/ResStatisticsSession.cpp
    • -0
    • +428
    /core/conn/jdbc_type2/native/ResStatisticsSession.h
    • -0
    • +2537
    /core/conn/jdbc_type2/native/ResStatisticsStatement.cpp
    • -0
    • +458
    /core/conn/jdbc_type2/native/ResStatisticsStatement.h
  1. … 2803 more files in changeset.
Move new DCS files to dcs tree

Merge remote branch 'dcs/master'

Merge remote branch 'install/master'

Merge remote branch 'phoenix_test/master'

Merge remote branch 'win-odbc64/master'

    • -14
    • +32
    /win-odbc64/odbcclient/README.txt
Add Trafodion docs - xml source

    • binary
    /docs/client_install/source/img/Add_Alias_SQuirreL.png
    • binary
    /docs/client_install/source/img/Add_Driver_SQuirreL.png
    • binary
    /docs/client_install/source/img/Extracted_Files.png
    • binary
    /docs/client_install/source/img/InstallComplete.png
    • binary
    /docs/client_install/source/img/InstallerWizardPaths.png
    • binary
    /docs/client_install/source/img/JDBC_JAR_Path.png
    • binary
    /docs/client_install/source/img/OptionalComponents.png
    • binary
    /docs/client_install/source/img/PerlJavaServerURL.png
  1. … 72 more files in changeset.
Merge remote branch 'matt/master'

  1. … 117 more files in changeset.
Move wms into subdir to combine repos

  1. … 357 more files in changeset.
Merge remote branch 'matt/master'

Rename test to tests/phx

  1. … 77 more files in changeset.
Rename test to tests/phx

  1. … 75 more files in changeset.
Rename test to tests/phx

  1. … 77 more files in changeset.
Move win-odbc64 into subdir to combine repos

  1. … 554 more files in changeset.
Merge remote branch 'win-odbc64/stable/1.1' into stable/1.1

Move win-odbc64 into subdir to combine repos

  1. … 554 more files in changeset.
Merge remote branch 'win-odbc64/stable/1.0' into stable/1.0

Move win-odbc64 into subdir to combine repos

  1. … 554 more files in changeset.
Merge remote branch 'win-odbc64/master'

Move phoenix_test into test subdir to combine repos

  1. … 78 more files in changeset.
Merge remote branch 'phoenix_test/stable/1.1' into stable/1.1

Move phoenix_test into test subdir to combine repos

  1. … 76 more files in changeset.
Merge remote branch 'phoenix_test/stable/1.0' into stable/1.0

Move phoenix_test into test subdir to combine repos

  1. … 78 more files in changeset.
Merge remote branch 'phoenix_test/master'