Clone
Anoop Sharma <anoop.sharma@esgyn.com>
committed
on 11 Jun 18
Merge remote branch 'origin/master' into ansharma_nnpk_br
Conflicts:
core/sql/regress/seabase/EXPECTED031
core/sql/sqlcomp/CmpDescribe.cpp… Show more
Merge remote branch 'origin/master' into ansharma_nnpk_br

Conflicts:

        core/sql/regress/seabase/EXPECTED031

        core/sql/sqlcomp/CmpDescribe.cpp

        core/sql/sqlcomp/CmpSeabaseDDLtable.cpp

        core/sql/sqlcomp/DefaultConstants.h

Show less

master + 2 more