Trafodion

Clone Tools
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Allow scan esps to take # of partitions.

    • -24
    • +33
    /core/sql/optimizer/OptPhysRelExpr.cpp
Merge remote branch 'log4cxx/temp-merge' into migrate_log4cpp_to_log4cxx

Conflicts:

core/log4cpp/.gitignore

core/log4cpp/log4cpp-1.1.1/COPYING

core/log4cpp/log4cpp-1.1.1/ChangeLog

core/log4cpp/log4cpp-1.1.1/include/.cvsignore

core/log4cpp/log4cpp-1.1.1/include/Makefile.am

core/log4cpp/log4cpp-1.1.1/include/Makefile.in

core/log4cpp/log4cpp-1.1.1/include/config.h.in

core/log4cpp/log4cpp-1.1.1/include/log4cpp/.cvsignore

core/log4cpp/log4cpp-1.1.1/include/log4cpp/AbortAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Appender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/AppenderSkeleton.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/AppendersFactory.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/BasicConfigurator.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/BasicLayout.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/BufferingAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Category.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/CategoryStream.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Configurator.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Export.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/FactoryParams.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/FileAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Filter.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/FixedContextCategory.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/HierarchyMaintainer.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/IdsaAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Layout.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/LayoutAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/LayoutsFactory.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/LevelEvaluator.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/LoggingEvent.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Makefile.am

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Makefile.in

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Manipulator.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/NDC.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/NTEventLogAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/OstreamAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/PassThroughLayout.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/PatternLayout.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Portability.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Priority.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/PropertyConfigurator.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/RemoteSyslogAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/RollingFileAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/SimpleConfigurator.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/SimpleLayout.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/SmtpAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/StringQueueAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/SyslogAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/TimeStamp.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/TriggeringEventEvaluator.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/TriggeringEventEvaluatorFactory.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/Win32DebugAppender.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/config-MinGW32.h

core/log4cpp/log4cpp-1.1.1/include/log4cpp/config-openvms.h

core/log4cpp/log4cpp-1.1.1/include/log4cpp/config-win32-stlport-boost.h

core/log4cpp/log4cpp-1.1.1/include/log4cpp/config.h

core/log4cpp/log4cpp-1.1.1/include/log4cpp/convenience.h

core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/BoostThreads.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/DummyThreads.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/MSThreads.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/Makefile.am

core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/Makefile.in

core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/OmniThreads.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/PThreads.hh

core/log4cpp/log4cpp-1.1.1/include/log4cpp/threading/Threading.hh

core/log4cpp/log4cpp-1.1.1/src/.cvsignore

core/log4cpp/log4cpp-1.1.1/src/AbortAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/Appender.cpp

core/log4cpp/log4cpp-1.1.1/src/AppenderSkeleton.cpp

core/log4cpp/log4cpp-1.1.1/src/AppendersFactory.cpp

core/log4cpp/log4cpp-1.1.1/src/BasicConfigurator.cpp

core/log4cpp/log4cpp-1.1.1/src/BasicLayout.cpp

core/log4cpp/log4cpp-1.1.1/src/BufferingAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/Category.cpp

core/log4cpp/log4cpp-1.1.1/src/CategoryStream.cpp

core/log4cpp/log4cpp-1.1.1/src/Configurator.cpp

core/log4cpp/log4cpp-1.1.1/src/DllMain.cpp

core/log4cpp/log4cpp-1.1.1/src/DummyThreads.cpp

core/log4cpp/log4cpp-1.1.1/src/FactoryParams.cpp

core/log4cpp/log4cpp-1.1.1/src/FileAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/Filter.cpp

core/log4cpp/log4cpp-1.1.1/src/FixedContextCategory.cpp

core/log4cpp/log4cpp-1.1.1/src/HierarchyMaintainer.cpp

core/log4cpp/log4cpp-1.1.1/src/IdsaAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/LayoutAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/LayoutsFactory.cpp

core/log4cpp/log4cpp-1.1.1/src/LevelEvaluator.cpp

core/log4cpp/log4cpp-1.1.1/src/Localtime.cpp

core/log4cpp/log4cpp-1.1.1/src/Localtime.hh

core/log4cpp/log4cpp-1.1.1/src/LoggingEvent.cpp

core/log4cpp/log4cpp-1.1.1/src/MSThreads.cpp

core/log4cpp/log4cpp-1.1.1/src/Makefile

core/log4cpp/log4cpp-1.1.1/src/Makefile.am

core/log4cpp/log4cpp-1.1.1/src/Makefile.in

core/log4cpp/log4cpp-1.1.1/src/Manipulator.cpp

core/log4cpp/log4cpp-1.1.1/src/NDC.cpp

core/log4cpp/log4cpp-1.1.1/src/NTEventLogAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/OmniThreads.cpp

core/log4cpp/log4cpp-1.1.1/src/OstreamAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/PThreads.cpp

core/log4cpp/log4cpp-1.1.1/src/PassThroughLayout.cpp

core/log4cpp/log4cpp-1.1.1/src/PatternLayout.cpp

core/log4cpp/log4cpp-1.1.1/src/PortabilityImpl.cpp

core/log4cpp/log4cpp-1.1.1/src/PortabilityImpl.hh

core/log4cpp/log4cpp-1.1.1/src/Priority.cpp

core/log4cpp/log4cpp-1.1.1/src/Properties.cpp

core/log4cpp/log4cpp-1.1.1/src/Properties.hh

core/log4cpp/log4cpp-1.1.1/src/PropertyConfigurator.cpp

core/log4cpp/log4cpp-1.1.1/src/PropertyConfiguratorImpl.cpp

core/log4cpp/log4cpp-1.1.1/src/PropertyConfiguratorImpl.hh

core/log4cpp/log4cpp-1.1.1/src/RemoteSyslogAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/RollingFileAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/SimpleConfigurator.cpp

core/log4cpp/log4cpp-1.1.1/src/SimpleLayout.cpp

core/log4cpp/log4cpp-1.1.1/src/SmtpAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/StringQueueAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/StringUtil.cpp

core/log4cpp/log4cpp-1.1.1/src/StringUtil.hh

core/log4cpp/log4cpp-1.1.1/src/SyslogAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/TimeStamp.cpp

core/log4cpp/log4cpp-1.1.1/src/TriggeringEventEvaluatorFactory.cpp

core/log4cpp/log4cpp-1.1.1/src/Win32DebugAppender.cpp

core/log4cpp/log4cpp-1.1.1/src/macros.gmk

core/log4cpp/log4cpp-1.1.1/src/snprintf.c

core/log4cpp/log4cpp-1.1.1/src/verslib.h

core/log4cpp/log4cpp-1.1.1/src/verslog4cpplib.cpp

core/sqf/conf/log4cpp.monitor.mon.config

core/sqf/conf/log4cpp.monitor.mon.snmp.config

core/sqf/conf/log4cpp.monitor.psd.config

core/sqf/conf/log4cpp.monitor.wdg.config

core/sqf/conf/log4cpp.monitor.wdg.snmp.config

core/sqf/conf/log4cpp.trafodion.lob.config

core/sqf/conf/log4cpp.trafodion.masterexe.config

core/sqf/conf/log4cpp.trafodion.sscp.config

core/sqf/conf/log4cpp.trafodion.ssmp.config

core/sqf/conf/log4cpp.trafodion.tm.config

core/sqf/conf/log4cpp.trafodion.udr.config

core/sql/bin/vers_log4cpp.cpp

sql/bin/vers_log4cpp.cpp

sql/bin/vers_log4cxx.cpp

    • -3
    • +3
    /core/conn/odbc/src/odbc/nsksrvr/Makefile
    • -1
    • +1
    /core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp
    • -30
    • +64
    /core/sqf/commonLogger/CommonLogger.cpp
    • -13
    • +19
    /core/sqf/commonLogger/CommonLogger.h
    • -0
    • +25
    /core/sqf/conf/log4cxx.monitor.mon.config
    • -0
    • +25
    /core/sqf/conf/log4cxx.monitor.mon.snmp.config
    • -0
    • +25
    /core/sqf/conf/log4cxx.monitor.psd.config
    • -0
    • +25
    /core/sqf/conf/log4cxx.monitor.wdg.config
    • -0
    • +25
    /core/sqf/conf/log4cxx.monitor.wdg.snmp.config
  1. … 206 more files in changeset.
Merge remote branch 'origin/master' into temp-merge

    • -0
    • +14
    /conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
More fixes to CClusterConfig

Change-Id: I39d98eefb67296f4b90bfcd2e1dce6d5d5a5660a

Merge branch 'master' into traf/opensrc

Merge remote branch 'gerrit/master' into traf/opensrc

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 "Added a hive test to core"

Merge branch 'master' of https://github.com/trafodion/core

Conflicts:

sqf/sqenvcom.sh

sql/nskgmake/Makerules.linux

sql/nskgmake/qms/Makefile

sql/nskgmake/sqlci/Makefile

Change-Id: I2589648e978c247c96f6c914e689010916b04037

    • -2
    • +4
    /conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp
More fixes to shell.

Change-Id: I8451fe6d1cb31a3f83e0e42cb546968946d0e372

Added a hive test to core

Hive tests fail at times since there is no test that is part of the core

suite and sometimes people miss running them. So added one test so it's

part of the gate tests. It's a very short test that runs in a few

seconds. The Hive suite should be runfor more comprehensive coverage.

Change-Id: I75862841e52a71583632408fd06f6cc5fd6d83ac

    • -0
    • +1602
    /sql/regress/core/EXPECTED162
    • -0
    • +79
    /sql/regress/core/TEST162
Merge "Change to get rid of curl lib packaging."

Merge "Added missing HP copyright in 1 file"

Merge "Trafodion should record the FQDN as client_name in Repository tables"

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 "Fix for hive regr failure"

Monitor unit test fixes.

Change-Id: Ic8bf4247e88693553fa2c5779e3ff45317f45585

    • -1
    • +52
    /sqf/sql/scripts/bats/sqconfig.monitor
    • -1
    • +52
    /sqf/sql/scripts/bats/sqconfig.seabed
Added missing HP copyright in a single file

Change-Id: Icd16eaf4f0eecfd225f547ff1d2e1053698dd680

Added missing HP copyright in 1 file

Change-Id: Ic112210951a05b3374e0eee22d7938d0e9481e40

Merge "Fix for LP 1460771"

Merge conflix fix.

Change-Id: I1ae99ae46d950662d1eed537317bbd5602309fdd

Merge branch 'master' of /archive/gcorrea/traf-config

Conflicts:

sqf/monitor/linux/clusterconf.cxx

Change-Id: I79e9c86b680b3a50a12cc59731ccfcc2094fe771

Added 'persist config/exec/info' commands.

Change-Id: I07e7afe5bb9b4e8d302d93384630149829df761a

    • -118
    • +124
    /sqf/monitor/linux/clusterconf.cxx
    • -45
    • +16
    /sqf/monitor/linux/persistconfig.cxx
    • -26
    • +16
    /sqf/monitor/linux/persistconfig.h
    • -2699
    • +3542
    /sqf/monitor/linux/shell.cxx
Merge "fixes bug 1464364"

Merge "initial support for returning multiple versions and column timestamps"

Merge "Remove obsolete sqlutils references"

Fix for hive regr failure

The interface change to pass in lobMax Size that is relevant only for

lob columns affected a common interface used by the hive interface.

Fixed it to pass 0 for lobMaxSize into that interface when called for

accepssing hive tables. All hive tests pass.

Change-Id: Ibfbf04057ac09d60960be20f36ff5f583fe783fd