Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 8b870e94f1352546f2e2aa1dd35851f1a1840fcb https://github.com/teiid/teiid/commit/8b870e94f1352546f2e2aa1dd35851f1a18... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-06-23 (Thu, 23 Jun 2016) Changed paths: M common-core/src/main/java/org/teiid/core/types/DataTypeManager.java M engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java M engine/src/main/java/org/teiid/query/QueryPlugin.java M engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRaiseAccess.java M engine/src/main/java/org/teiid/query/processor/relational/MergeJoinStrategy.java M engine/src/main/java/org/teiid/query/util/Options.java M engine/src/main/resources/org/teiid/query/i18n.properties M engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java M engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java M jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html Log Message: ----------- TEIID-4129 removing the pushdown of a string sort for sort/merge in more circumstances