Clone
Roberta Marton <rmarton@edev07.esgyn.local>
committed
on 05 Aug 16
Merge branch 'master' into trafodion-1788
Conflicts:
core/sql/common/ComSmallDefs.h
core/sql/generator/Generator.cpp
core/sql/optimizer/N… Show more
Merge branch 'master' into trafodion-1788

Conflicts:

        core/sql/common/ComSmallDefs.h

        core/sql/generator/Generator.cpp

        core/sql/optimizer/NATable.cpp

        core/sql/sqlcat/ReadTableDef.cpp

        core/sql/sqlcat/desc.h

Show less

default + 5 more